diff --git a/ghost/admin/app/components/posts/analytics.hbs b/ghost/admin/app/components/posts/analytics.hbs
index 2afb5b240a..0d073eaf67 100644
--- a/ghost/admin/app/components/posts/analytics.hbs
+++ b/ghost/admin/app/components/posts/analytics.hbs
@@ -129,7 +129,7 @@
             {{/if}}
 
             {{#if this.showMentions }}
-                <div class="gh-post-analytics-box gh-post-analytics-mentions">
+                <div class="gh-post-analytics-box gh-post-analytics-mentions {{unless this.showLinks "is-full-width"}}">
                     <h3 class="gh-post-analytics-mentions-header">Mentions</h3>
                     <div class="gh-post-analytics-mentions-list">
                         {{#if this.mentions}}
@@ -146,9 +146,11 @@
                             </div>
                         {{/if}}
                     </div>
-                    <div class="gh-dashboard-list-footer">
-                        <LinkTo @route="posts.mentions" @model={{this.post.id}}>View all mentions &rarr;</LinkTo>
-                    </div>
+                    {{#if this.mentions}}
+                        <div class="gh-dashboard-list-footer">
+                            <LinkTo @route="posts.mentions" @model={{this.post.id}}>View all mentions &rarr;</LinkTo>
+                        </div>
+                    {{/if}}
                 </div>
             {{/if}}
         </div>
diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css
index 2df16a520e..8513df3793 100644
--- a/ghost/admin/app/styles/layouts/content.css
+++ b/ghost/admin/app/styles/layouts/content.css
@@ -1914,6 +1914,10 @@
     justify-content: space-between;
 }
 
+.gh-post-analytics-mentions.is-full-width {
+    display: none;
+}
+
 .gh-post-analytics-mentions-header {
     font-size: 1.55rem;
     font-weight: 700;
diff --git a/ghost/admin/app/templates/mentions.hbs b/ghost/admin/app/templates/mentions.hbs
index f5e5f9dded..e9e6de5b85 100644
--- a/ghost/admin/app/templates/mentions.hbs
+++ b/ghost/admin/app/templates/mentions.hbs
@@ -28,7 +28,7 @@
                 {{/if}}
             </h2>
 
-            {{#if this.post }}
+            {{#if (and this.post this.mentionsInfinityModel)}}
                 <div class="gh-post-analytics-meta">
                     <div class="gh-post-analytics-meta-text">
                         This post was mentioned in: