diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index 63255dcbd8..0ebb5e4483 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -14,7 +14,7 @@
     }
     // Remove existing instance of this component in case props changed
     structureLookupMap[parentId] = structureLookupMap[parentId].filter(
-      blockComponent => blockComponent.instance._id !== id
+      blockComponent => blockComponent.order !== order
     )
     // Add new instance of this component
     structureLookupMap[parentId].push({ order, instance })
diff --git a/packages/client/src/components/BlockComponent.svelte b/packages/client/src/components/BlockComponent.svelte
index 06865b7032..e77158fe5f 100644
--- a/packages/client/src/components/BlockComponent.svelte
+++ b/packages/client/src/components/BlockComponent.svelte
@@ -39,7 +39,7 @@
   // ejected later
   $: {
     if ($builderStore.inBuilder) {
-      block.registerComponent(id, order, $component?.id, instance)
+      block.registerComponent(id, order ?? 0, $component?.id, instance)
     }
   }
 </script>