1 files changed, 5 insertions, 9 deletions

diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 9b2b049b7..ad24a04cd 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -10,7 +10,7 @@ import EventEmitter from 'events';
 
 import * as Utils from '../utils/utils.jsx';
 import * as AsyncClient from '../utils/async_client.jsx';
-import * as EventHelpers from '../dispatcher/event_helpers.jsx';
+import * as GlobalActions from '../action_creators/global_actions.jsx';
 
 import Constants from '../utils/constants.jsx';
 const SocketEvents = Constants.SocketEvents;
@@ -42,10 +42,6 @@ class SocketStoreClass extends EventEmitter {
             return;
         }
 
-        if (!global.window.hasOwnProperty('mm_session_token_index')) {
-            return;
-        }
-
         this.setMaxListeners(0);
 
         if (window.WebSocket && !conn) {
@@ -54,7 +50,7 @@ class SocketStoreClass extends EventEmitter {
                 protocol = 'wss://';
             }
 
-            var connUrl = protocol + location.host + ((/:\d+/).test(location.host) ? '' : Utils.getWebsocketPort(protocol)) + '/api/v1/websocket?' + Utils.getSessionIndex();
+            var connUrl = protocol + location.host + ((/:\d+/).test(location.host) ? '' : Utils.getWebsocketPort(protocol)) + '/api/v1/websocket';
 
             if (this.failCount === 0) {
                 console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
@@ -204,7 +200,7 @@ class SocketStoreClass extends EventEmitter {
 function handleNewPostEvent(msg, translations) {
     // Store post
     const post = JSON.parse(msg.props.post);
-    EventHelpers.emitPostRecievedEvent(post);
+    GlobalActions.emitPostRecievedEvent(post);
 
     // Update channel state
     if (ChannelStore.getCurrentId() === msg.channel_id) {
@@ -291,7 +287,7 @@ function handlePostEditEvent(msg) {
 
 function handlePostDeleteEvent(msg) {
     const post = JSON.parse(msg.props.post);
-    EventHelpers.emitPostDeletedEvent(post);
+    GlobalActions.emitPostDeletedEvent(post);
 }
 
 function handleNewUserEvent() {
@@ -337,7 +333,7 @@ function handleChannelViewedEvent(msg) {
 
 function handlePreferenceChangedEvent(msg) {
     const preference = JSON.parse(msg.props.preference);
-    EventHelpers.emitPreferenceChangedEvent(preference);
+    GlobalActions.emitPreferenceChangedEvent(preference);
 }
 
 var SocketStore = new SocketStoreClass();