diff --git a/src/stores/websocket.js b/src/stores/websocket.js
index 5771569..1cbc412 100644
--- a/src/stores/websocket.js
+++ b/src/stores/websocket.js
@@ -12,6 +12,7 @@ export const useWebsocketStore = defineStore("websocket", {
         init(gameId) {
             const player = usePlayerStore()
             const game = useGameStore()
+            if (game.owner == player.id || game.opponent.id == player.id) window.location.href = window.location.origin + '/lobby/' + game.id
             this.connection = new WebSocket(connectionUrl + "?gameId=" + gameId + "&playerId=" + player.id);
             this.connection.onopen = function (event) {
                 console.log(event);
@@ -46,7 +47,6 @@ export const useWebsocketStore = defineStore("websocket", {
                         break
                     case 'join':
                         console.log('Recieve join from ' + data.from)
-                        if (game.owner == data.from || game.opponent.id == data.from) window.location.href = window.location.origin + '/lobby/' + game.id
                         if (game.owner != player.id) return // Only owner can process join
                         game.join(data.from)
                         break