1 files changed, 6 insertions, 1 deletions
diff --git a/modern/src/SocketController.js b/modern/src/SocketController.js
index bfc0378d..baecbfce 100644
--- a/modern/src/SocketController.js
+++ b/modern/src/SocketController.js
@@ -11,6 +11,7 @@ import usePersistedState from './common/util/usePersistedState';
 
 import alarm from './resources/alarm.mp3';
 import { eventsActions } from './store/events';
+import useFeatures from './common/util/useFeatures';
 
 const SocketController = () => {
   const dispatch = useDispatch();
@@ -28,6 +29,8 @@ const SocketController = () => {
   const [soundEvents] = usePersistedState('soundEvents', []);
   const [soundAlarms] = usePersistedState('soundAlarms', ['sos']);
 
+  const features = useFeatures();
+
   const connectSocket = () => {
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
     const socket = new WebSocket(`${protocol}//${window.location.host}/api/socket`);
@@ -61,7 +64,9 @@ const SocketController = () => {
         dispatch(positionsActions.update(data.positions));
       }
       if (data.events) {
-        dispatch(eventsActions.add(data.events));
+        if (!features.disableEvents) {
+          dispatch(eventsActions.add(data.events));
+        }
         setEvents(data.events);
       }
     };