diff --git a/application.py b/application.py
index 898789d..f7e78f1 100644
--- a/application.py
+++ b/application.py
@@ -18,7 +18,7 @@ from flask_socketio import SocketIO, emit, join_room
 
 application = Flask(__name__)
 application.secret_key = secrets.token_hex(64)
-websocket_manager = SocketIO(application, manage_session=False, async_mode='threading')
+websocket_manager = SocketIO(application, manage_session=False)
 scheduler_instance = BackgroundScheduler(timezone="Europe/Berlin")
 european_timezone = zoneinfo.ZoneInfo("Europe/Berlin")
 
diff --git a/static/behavior.js b/static/behavior.js
index 4b8323d..36ccec9 100644
--- a/static/behavior.js
+++ b/static/behavior.js
@@ -281,7 +281,7 @@ document.addEventListener("DOMContentLoaded", function() {
     }
 
     if (typeof io !== "undefined") {
-        websocket_connection = io({ transports: ["polling"], upgrade: false });
+        websocket_connection = io();
         
         websocket_connection.on("game_state_changed", function() {
             if (document.querySelector(".game-section") || document.querySelector(".administrator-section")) {