diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index e5b73c7..16d4109 100755
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -36,7 +36,7 @@ import ArchivedDownloads from "./Archived";
 
 const drawerWidth: number = 240;
 
-const socket = io(`http://${localStorage.getItem('server-addr') || 'localhost'}:${localStorage.getItem('server-port') || '3022'}`)
+const socket = io(`http://${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}`)
 
 interface AppBarProps extends MuiAppBarProps {
     open?: boolean;