diff --git a/src/page/components/header.vue b/src/page/components/header.vue
index 7bb6a018..52139298 100644
--- a/src/page/components/header.vue
+++ b/src/page/components/header.vue
@@ -94,7 +94,12 @@
   export default class extends Vue {
     @Prop() readonly neko!: Neko
 
-    url: string = location.href
+    @Watch('neko.state.connection.url')
+    updateUrl(url: string) {
+      this.url = url
+    }
+
+    url: string = ''
 
     async setUrl() {
       if (this.url == '') {
diff --git a/src/page/main.vue b/src/page/main.vue
index 022b655a..bf378103 100644
--- a/src/page/main.vue
+++ b/src/page/main.vue
@@ -5,7 +5,7 @@
         <neko-header :neko="neko" @toggle="expanded = !expanded" />
       </div>
       <div class="video-container">
-        <neko-canvas ref="neko" autologin autoconnect autoplay />
+        <neko-canvas ref="neko" :server="server" autologin autoconnect autoplay />
         <div v-if="loaded && neko.private_mode_enabled" class="player-notif">Private mode is currently enabled.</div>
         <div
           v-if="loaded && neko.state.connection.type === 'webrtc' && !neko.state.video.playing"
@@ -366,6 +366,8 @@
     loaded: boolean = false
     tab: string = ''
 
+    server: string = location.href
+
     uploadActive = false
     uploadProgress = 0
 
@@ -399,6 +401,12 @@
       //@ts-ignore
       window.neko = this.neko
 
+      // initial URL
+      const url = new URL(location.href).searchParams.get('url')
+      if (url) {
+        this.server = url
+      }
+
       //
       // connection events
       //