diff --git a/plugins/apollo.client.ts b/plugins/apollo.client.ts
index f8f3a3d3..8fc24e9f 100644
--- a/plugins/apollo.client.ts
+++ b/plugins/apollo.client.ts
@@ -78,7 +78,7 @@ export default defineNuxtPlugin((nuxtApp) => {
             "Invalid response from authorization hook",
           ].includes(graphqlError.message)
         ) {
-          return;
+          continue;
         }
 
         toast({
diff --git a/stores/AuthStore.ts b/stores/AuthStore.ts
index 6477d70a..22ca08f1 100644
--- a/stores/AuthStore.ts
+++ b/stores/AuthStore.ts
@@ -85,50 +85,49 @@ export const useAuthStore = defineStore("auth", () => {
       });
     }
 
-    return await new Promise(async (resolve) => {
-      try {
-        const response = await getGraphqlClient().query({
-          query: generateQuery({
-            me: {
-              role: true,
-              steam_id: true,
-              discord_id: true,
-            },
-          }),
-          fetchPolicy: "network-only", // Disable cache
-        });
+    try {
+      const response = await getGraphqlClient().query({
+        query: generateQuery({
+          me: {
+            role: true,
+            steam_id: true,
+            discord_id: true,
+          },
+        }),
+        fetchPolicy: "network-only", // Disable cache
+      });
+
+      if (!response.data.me) {
+        return false;
+      }
 
-        if (!response.data.me) {
-          resolve(false);
-          return;
-        }
-
-        socket.connect();
-
-        hasDiscordLinked.value = !!response.data.me.discord_id;
-
-        const wsClient = useNuxtApp().$wsClient as import("graphql-ws").Client;
-        wsClient.terminate();
-        await new Promise<void>((resolveWs) => {
-          const timeout = setTimeout(() => {
-            dispose();
-            resolveWs();
-          }, 10000);
-          const dispose = wsClient.on("connected", () => {
-            clearTimeout(timeout);
-            dispose();
-            resolveWs();
-          });
+      socket.connect();
+
+      hasDiscordLinked.value = !!response.data.me.discord_id;
+
+      const wsClient = useNuxtApp().$wsClient as import("graphql-ws").Client;
+      wsClient.terminate();
+      await new Promise<void>((resolveWs) => {
+        const timeout = setTimeout(() => {
+          dispose();
+          resolveWs();
+        }, 10000);
+        const dispose = wsClient.on("connected", () => {
+          clearTimeout(timeout);
+          dispose();
+          resolveWs();
         });
+      });
 
+      return await new Promise<boolean>((resolve) => {
         subscribeToMe(response.data.me.steam_id, () => {
           resolve(true);
         });
-      } catch (error) {
-        console.warn("auth failure", error);
-        resolve(false);
-      }
-    });
+      });
+    } catch (error) {
+      console.warn("auth failure", error);
+      return false;
+    }
   }
 
   const isUser = computed(() => me.value?.role === e_player_roles_enum.user);
diff --git a/web-sockets/Webrtc.ts b/web-sockets/Webrtc.ts
index 72fbbd9f..96dfdb3e 100644
--- a/web-sockets/Webrtc.ts
+++ b/web-sockets/Webrtc.ts
@@ -81,7 +81,13 @@ class WebRTCClient {
     this.dataChannels.set(peer.id, dataChannel);
 
     return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        this.cleanupPeer(peer.id);
+        reject(new Error("Data channel open timeout"));
+      }, 10000);
+
       dataChannel.onopen = () => {
+        clearTimeout(timeout);
         resolve(dataChannel);
       };
 
@@ -90,6 +96,7 @@ class WebRTCClient {
       };
 
       dataChannel.onerror = (error: any) => {
+        clearTimeout(timeout);
         console.error(`[WebRTC] Data channel error for peer ${peer.id}:`, {
           label: dataChannel.label,
           readyState: dataChannel.readyState,
@@ -98,12 +105,13 @@ class WebRTCClient {
         reject(error);
       };
       dataChannel.onclose = () => {
+        clearTimeout(timeout);
         this.cleanupPeer(peer.id);
       };
     });
   }
 
-  private async createPeer(region: string): Promise<ExtendedPeer> {
+  private createPeer(region: string): Promise<ExtendedPeer> {
     return new Promise((resolve, reject) => {
       const peer = new Peer({
         trickle: true,
@@ -122,8 +130,15 @@ class WebRTCClient {
       peer.id = uuidv4();
       this.peers.set(peer.id, peer);
 
+      const timeout = setTimeout(() => {
+        peer.destroy();
+        this.cleanupPeer(peer.id);
+        reject(new Error("Peer connection timeout"));
+      }, 10000);
+
       peer
         .on("connect", () => {
+          clearTimeout(timeout);
           resolve(peer);
         })
         .on("signal", (data: any) => {
@@ -135,13 +150,16 @@ class WebRTCClient {
           });
         })
         .on("error", (err: Error) => {
+          clearTimeout(timeout);
           console.error(
             `[WebRTC] Peer connection error for peer ${peer.id}:`,
             err,
           );
+          peer.destroy();
           reject(err);
         })
         .on("close", () => {
+          clearTimeout(timeout);
           this.cleanupPeer(peer.id);
         });
     });