diff --git a/pwa/src/App.tsx b/pwa/src/App.tsx
index ecbdd21..a0fd283 100644
--- a/pwa/src/App.tsx
+++ b/pwa/src/App.tsx
@@ -1,4 +1,4 @@
-import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
+import { HashRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
 import { AuthProvider } from './contexts/AuthContext'
 import { useAuth } from './hooks/useAuth'
 import LandingPage from './components/LandingPage'
diff --git a/pwa/src/components/game/hooks/useGameEngine.ts b/pwa/src/components/game/hooks/useGameEngine.ts
index 3291430..6cf50dd 100644
--- a/pwa/src/components/game/hooks/useGameEngine.ts
+++ b/pwa/src/components/game/hooks/useGameEngine.ts
@@ -1078,7 +1078,14 @@ export function useGameEngine(
   useEffect(() => {
     if (!token) return
 
-    const wsUrl = `${import.meta.env.VITE_WS_URL || 'ws://localhost:8000'}/ws/game/${token}`
+    // Get WebSocket URL based on environment (same logic as api.ts)
+    const API_BASE = import.meta.env.VITE_API_URL || (
+      import.meta.env.PROD
+        ? 'https://api-staging.echoesoftheash.com'
+        : 'http://localhost:8000'
+    )
+    const wsBase = API_BASE.replace(/^http/, 'ws')
+    const wsUrl = `${wsBase}/ws/game/${token}`
     console.log('🔌 Connecting to WebSocket:', wsUrl)
 
     const ws = new WebSocket(wsUrl)