diff --git a/framework/core/js/src/forum/components/DiscussionListItem.tsx b/framework/core/js/src/forum/components/DiscussionListItem.tsx
index 20e2946c8..f37b60c63 100644
--- a/framework/core/js/src/forum/components/DiscussionListItem.tsx
+++ b/framework/core/js/src/forum/components/DiscussionListItem.tsx
@@ -117,7 +117,7 @@ export default class DiscussionListItem<CustomAttrs extends IDiscussionListItemA
           <ul className="DiscussionListItem-badges badges">{listItems(discussion.badges().toArray())}</ul>
 
           <Link href={app.route.discussion(discussion, jumpTo)} className="DiscussionListItem-main">
-            <h3 className="DiscussionListItem-title">{highlight(discussion.title(), this.highlightRegExp)}</h3>
+            <h2 className="DiscussionListItem-title">{highlight(discussion.title(), this.highlightRegExp)}</h2>
             <ul className="DiscussionListItem-info">{listItems(this.infoItems().toArray())}</ul>
           </Link>
           {this.replyCountItem()}
diff --git a/framework/core/js/src/forum/components/DiscussionListPane.js b/framework/core/js/src/forum/components/DiscussionListPane.js
index 2c46f55c6..f48d0ad2a 100644
--- a/framework/core/js/src/forum/components/DiscussionListPane.js
+++ b/framework/core/js/src/forum/components/DiscussionListPane.js
@@ -22,7 +22,7 @@ export default class DiscussionListPane extends Component {
       return;
     }
 
-    return <div className="DiscussionPage-list">{this.enoughSpace() && <DiscussionList state={this.attrs.state} />}</div>;
+    return <aside className="DiscussionPage-list">{this.enoughSpace() && <DiscussionList state={this.attrs.state} />}</aside>;
   }
 
   oncreate(vnode) {
diff --git a/framework/core/views/frontend/content/discussion.blade.php b/framework/core/views/frontend/content/discussion.blade.php
index 51a2c9c0c..55040ede2 100644
--- a/framework/core/views/frontend/content/discussion.blade.php
+++ b/framework/core/views/frontend/content/discussion.blade.php
@@ -1,15 +1,15 @@
 <div class="container">
-    <h2>{{ $apiDocument->data->attributes->title }}</h2>
+    <h1>{{ $apiDocument->data->attributes->title }}</h1>
 
     <div>
         @foreach ($posts as $post)
-            <div>
+            <article>
                 @php $user = ! empty($post->relationships->user->data) ? $getResource($post->relationships->user->data) : null; @endphp
                 <h3>{{ $user ? $user->attributes->displayName : $translator->trans('core.lib.username.deleted_text') }}</h3>
                 <div class="Post-body">
                     {!! $post->attributes->contentHtml !!}
                 </div>
-            </div>
+            </article>
 
             <hr>
         @endforeach
diff --git a/framework/core/views/frontend/content/index.blade.php b/framework/core/views/frontend/content/index.blade.php
index af938247c..882b4e9c9 100644
--- a/framework/core/views/frontend/content/index.blade.php
+++ b/framework/core/views/frontend/content/index.blade.php
@@ -1,7 +1,7 @@
 @inject('url', 'Flarum\Http\UrlGenerator')
 
 <div class="container">
-    <h2>{{ $translator->trans('core.views.index.all_discussions_heading') }}</h2>
+    <h1>{{ $translator->trans('core.views.index.all_discussions_heading') }}</h1>
 
     <ul>
         @foreach ($apiDocument->data as $discussion)