diff --git a/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js b/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
--- a/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
+++ b/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
@@ -10,13 +10,9 @@ var rhodeCodeApp = Polymer({
         for (var i = 0; i < alertMessagePayloads.length; i++) {
             $.Topic('/notifications').publish(alertMessagePayloads[i]);
         }
-
-        $.Topic('/plugins/__REGISTER__').subscribe(
-            this.kickoffChannelstreamPlugin.bind(this)
-        );
-
         $.Topic('/connection_controller/subscribe').subscribe(
             this.subscribeToChannelTopic.bind(this));
+        this.kickoffChannelstreamPlugin();
     },
 
     /** proxy to channelstream connection */
diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html
--- a/rhodecode/templates/base/root.html
+++ b/rhodecode/templates/base/root.html
@@ -146,11 +146,6 @@ c.template_context['visual']['default_re
 
         <%def name="head_extra()"></%def>
         ${self.head_extra()}
-        <script>
-            window.addEventListener("load", function(event) {
-                $.Topic('/plugins/__REGISTER__').prepareOrPublish({});
-            });
-        </script>
         ## extra stuff
         %if c.pre_code:
             ${c.pre_code|n}