diff --git a/kdb-bot/src/bot_api/api.py b/kdb-bot/src/bot_api/api.py
index 023fd54b..01211837 100644
--- a/kdb-bot/src/bot_api/api.py
+++ b/kdb-bot/src/bot_api/api.py
@@ -53,7 +53,10 @@ class Api(Flask):
         self.register_error_handler(exc_class, self.handle_exception)
 
         # websockets
-        self._socketio = SocketIO(self, cors_allowed_origins="*", path="/api/socket.io")
+        # Added async_mode see link below
+        # https://stackoverflow.com/questions/39370848/flask-socket-io-sometimes-client-calls-freeze-the-server
+        # https://github.com/miguelgrinberg/Flask-SocketIO/discussions/1849
+        self._socketio = SocketIO(self, cors_allowed_origins="*", path="/api/socket.io", async_mode="threading")
         self._socketio.on_event("connect", self.on_connect)
         self._socketio.on_event("disconnect", self.on_disconnect)