diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte
index 4878df157f..17f068e04f 100644
--- a/packages/client/src/components/Screen.svelte
+++ b/packages/client/src/components/Screen.svelte
@@ -20,8 +20,10 @@
 </script>
 
 <!-- Ensure to fully remount when screen changes -->
-{#key screenDefinition?._id}
-  <Provider key="url" data={params}>
-    <Component isScreen instance={screenDefinition} />
-  </Provider>
-{/key}
+{#if $routeStore.routerLoaded}
+  {#key screenDefinition?._id}
+    <Provider key="url" data={params}>
+      <Component isScreen instance={screenDefinition} />
+    </Provider>
+  {/key}
+{/if}