diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js.coffee b/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
index 987845cbab8..4be14f1d9c2 100644
--- a/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
+++ b/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
@@ -39,7 +39,6 @@ Discourse.ListController = Ember.Controller.extend Discourse.Presence,
         Discourse.TopicList.list(current).then (items) =>
           @set('filterSummary', items.filter_summary)
           @set('filterMode', filterMode)
-          @set('allLoaded', true) unless items.more_topics_url
           @set('loading', false)
           deferred.resolve(items)
 
diff --git a/app/assets/javascripts/discourse/models/topic_list.js.coffee b/app/assets/javascripts/discourse/models/topic_list.js.coffee
index 9e0685dc30c..6e9edbefa8b 100644
--- a/app/assets/javascripts/discourse/models/topic_list.js.coffee
+++ b/app/assets/javascripts/discourse/models/topic_list.js.coffee
@@ -9,6 +9,7 @@ window.Discourse.TopicList = Discourse.Model.extend
     Em.String.i18n('topics.no_' + @get('filter'))
   ).property('topics', 'topics@each', 'filter', 'loaded')
 
+
   loadMoreTopics: ->
     promise = new RSVP.Promise()
     if moreUrl = @get('more_topics_url')
diff --git a/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee b/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
index 38da7920432..2b6273190ad 100644
--- a/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
+++ b/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
@@ -5,8 +5,6 @@ window.Discourse.FilteredListRoute = Discourse.Route.extend
     listController = @controllerFor('list')
     listController.set('canCreateTopic', false)
     listController.set('filterMode', '')
-    listController.set('allLoaded', false)
-
 
   renderTemplate: ->
     @render 'listTopics', into: 'list', outlet: 'listView', controller: 'listTopics'
diff --git a/app/assets/javascripts/discourse/templates/list/list.js.handlebars b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
index 75ccca73170..c294ab930b9 100644
--- a/app/assets/javascripts/discourse/templates/list/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
@@ -35,10 +35,6 @@
         {{/if}}
 
         {{outlet listView}}
-        
-        {{#if controller.allLoaded}}
-          <h3>{{{i18n topics.footer}}}</h3>
-        {{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
index 04c16f88822..49aaccef160 100644
--- a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
@@ -55,5 +55,9 @@
       {{/if}}
     </footer>
 
+    {{#if view.allLoaded}}
+      <h3>{{{i18n topics.footer}}}</h3>
+    {{/if}}
+
   {{/if}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee b/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
index e5d97650a03..cd50ddebf20 100644
--- a/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
+++ b/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
@@ -18,6 +18,10 @@ window.Discourse.ListTopicsView = Ember.View.extend Discourse.Scrolling, Discour
 
   willDestroyElement: -> @unbindScrolling()
 
+  allLoaded: (->
+    !@get('loading') && !@get('controller.content.more_topics_url')
+  ).property('loading', 'controller.content.more_topics_url')
+
   didInsertElement: ->
     @bindScrolling()
     eyeline = new Discourse.Eyeline('.topic-list-item')
diff --git a/vendor/gems/message_bus/lib/message_bus/diagnostics.rb b/vendor/gems/message_bus/lib/message_bus/diagnostics.rb
index 8d8d34f8d86..97883c8a144 100644
--- a/vendor/gems/message_bus/lib/message_bus/diagnostics.rb
+++ b/vendor/gems/message_bus/lib/message_bus/diagnostics.rb
@@ -32,6 +32,7 @@ class MessageBus::Diagnostics
     end
 
     MessageBus.subscribe('/_diagnostics/discover') do |msg|
+      MessageBus.on_connect.call msg.site_id if MessageBus.on_connect
       MessageBus.publish '/_diagnostics/process-discovery', { 
         pid: Process.pid,
         process_name: $0,
@@ -39,6 +40,7 @@ class MessageBus::Diagnostics
         uptime: (Time.now.to_f - start_time).to_i,
         hostname: hostname
       }, user_ids: [msg.data["user_id"]]
+      MessageBus.on_disconnect.call msg.site_id if MessageBus.on_disconnect
     end
   end
 end
diff --git a/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb b/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
index 121d8144a3e..f240266a4f0 100644
--- a/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
+++ b/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
@@ -9,8 +9,6 @@ class MessageBus::Rack::Middleware
   def self.start_listener
     unless @started_listener
       MessageBus.subscribe do |msg|
-        p msg.channel
-        p msg.message_id
         EM.next_tick do 
           @@connection_manager.notify_clients(msg) if @@connection_manager
         end