diff --git a/app/src/App.svelte b/app/src/App.svelte
index 154479b..fc94b2f 100644
--- a/app/src/App.svelte
+++ b/app/src/App.svelte
@@ -4,9 +4,10 @@
 	import { connect } from './lib/socket';
 	import Stream from './components/Views/Stream.svelte';
 	import Controls from './components/Controls.svelte';
+	import location from './lib/location';
 
 	onMount(() => {
-		connect('ws://leika.local');
+		connect(`ws://${location}`);
 	});
 </script>
 
diff --git a/app/src/components/Views/Stream.svelte b/app/src/components/Views/Stream.svelte
index 6e9ca60..19f2cfd 100644
--- a/app/src/components/Views/Stream.svelte
+++ b/app/src/components/Views/Stream.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
+	import location from '../../lib/location';
 
-	let videoStream = '//leika.local/stream';
+	let videoStream = `//${location}/stream`;
 
 	onDestroy(() => {
 		videoStream = '#';
diff --git a/app/src/lib/location.ts b/app/src/lib/location.ts
new file mode 100644
index 0000000..dfb142e
--- /dev/null
+++ b/app/src/lib/location.ts
@@ -0,0 +1,3 @@
+const location = import.meta.env.DEV ? "leika.local" : window.location.host 
+
+export default location;
\ No newline at end of file