diff --git a/web/app/assets/javascripts/client_init.js.coffee b/web/app/assets/javascripts/client_init.js.coffee
index b33ac712e..61339212e 100644
--- a/web/app/assets/javascripts/client_init.js.coffee
+++ b/web/app/assets/javascripts/client_init.js.coffee
@@ -3,7 +3,6 @@
 $ = jQuery
 context = window
 context.JK ||= {};
-broadcastActions = @BroadcastActions
 logger = context.JK.logger
 
 context.JK.ClientInit = class ClientInit
@@ -20,11 +19,11 @@ context.JK.ClientInit = class ClientInit
 
     this.watchBroadcast()
 
-    if context.jamClient.RegisterSessionJoinLeaveRequestCallBack
+    if context.jamClient.RegisterSessionJoinLeaveRequestCallBack?
       context.jamClient.RegisterSessionJoinLeaveRequestCallBack("SessionStore.handleJoinLeaveRequestCallback")
 
   checkBroadcast: () =>
-    promise = broadcastActions.load.trigger()
+    promise = @BroadcastActions.load.trigger()
     if promise
       promise.catch(() ->
         false
diff --git a/web/app/assets/javascripts/react-components/actions/BroadcastActions.js.coffee b/web/app/assets/javascripts/react-components/actions/BroadcastActions.js.coffee
index e4bc43707..3582049eb 100644
--- a/web/app/assets/javascripts/react-components/actions/BroadcastActions.js.coffee
+++ b/web/app/assets/javascripts/react-components/actions/BroadcastActions.js.coffee
@@ -4,5 +4,3 @@ context = window
   load: {asyncResult: true},
   hide: {}
 })
-
-context.JK.Actions.Broadcast = BroadcastActions