diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb
index c316efe99f..7eb8a753c7 100644
--- a/lib/rdoc/context/section.rb
+++ b/lib/rdoc/context/section.rb
@@ -177,7 +177,7 @@ def marshal_load array
   # Parses +comment_location+ into an RDoc::Markup::Document composed of
   # multiple RDoc::Markup::Documents with their file set.
 
-  def parse
+  def parse _comment_location
     case @comments
     when String then
       super
diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb
index b54265717c..5b89dbaaf3 100644
--- a/lib/rdoc/generator/markup.rb
+++ b/lib/rdoc/generator/markup.rb
@@ -25,7 +25,7 @@ def as_href(from_path)
   # Handy wrapper for marking up this object's comment
 
   def description
-    markup @comment
+    markup @comment || @comments&.first
   end
 
   ##
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 97d175dddc..170863d091 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -38,7 +38,7 @@
     </header>
     <%- end -%>
 
-    <%- if section.comment then -%>
+    <%- if section.comment || section.comments.any? then -%>
     <div>
       <%= section.description %>
     </div>
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
index 0bc4aba428..085249eb42 100644
--- a/lib/rdoc/text.rb
+++ b/lib/rdoc/text.rb
@@ -95,6 +95,7 @@ def flush_left text
   # Requires the including class to implement #formatter
 
   def markup text
+    @store ||= @parent&.store
     if @store.rdoc.options
       locale = @store.rdoc.options.locale
     else