1 files changed, 19 insertions, 3 deletions
diff --git a/webapp/actions/diagnostics_actions.jsx b/webapp/actions/diagnostics_actions.jsx
index 4ffdfa552..72cf387b4 100644
--- a/webapp/actions/diagnostics_actions.jsx
+++ b/webapp/actions/diagnostics_actions.jsx
@@ -1,8 +1,24 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from 'client/web_client.jsx';
+import UserStore from 'stores/user_store.jsx';
 
-export function trackEvent(category, event, properties) {
-    Client.trackEvent(category, event, properties);
+export function trackEvent(category, event, props) {
+    if (global.window && global.window.analytics) {
+        const properties = Object.assign({category, type: event, user_actual_id: UserStore.getCurrentId()}, props);
+        const options = {
+            context: {
+                ip: '0.0.0.0'
+            },
+            page: {
+                path: '',
+                referrer: '',
+                search: '',
+                title: '',
+                url: ''
+            },
+            anonymousId: '00000000000000000000000000'
+        };
+        global.window.analytics.track('event', properties, options);
+    }
 }