diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index d2bfc5a0d..6d07abc1f 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -112,8 +112,6 @@
               </div>
             {{/if}}
 
-            {{custom-html "footer"}}
-
           {{/if}}
         {{/if}}
 
@@ -149,6 +147,10 @@
   {{/if}}
 {{/if}}
 
+{{#if postStream.loadedAllPosts}}
+  {{custom-html "footer"}}
+{{/if}}
+
 {{render "share"}}
 
 {{#if currentUser.enable_quoting}}