diff --git a/src/store/socket/index.ts b/src/store/socket/index.ts
index aa772298c8..08e865e742 100644
--- a/src/store/socket/index.ts
+++ b/src/store/socket/index.ts
@@ -6,9 +6,9 @@ import { getters } from '@/store/socket/getters'
 import { RootState } from '@/store/types'
 
 export const getDefaultState = (): SocketState => {
-    const hostname = (import.meta.env.VUE_APP_HOSTNAME as string) || 'tamo.pataar.nl'
+    const hostname = (import.meta.env.VUE_APP_HOSTNAME as string) || window.location.hostname
     const defaultPort = window.location.port || (window.location.protocol === 'https:' ? 443 : 80)
-    const port = import.meta.env.VUE_APP_PORT ? Number(import.meta.env.VUE_APP_PORT) : Number(7125)
+    const port = import.meta.env.VUE_APP_PORT ? Number(import.meta.env.VUE_APP_PORT) : Number(defaultPort)
 
     return {
         hostname,