diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 8b984b5dea..104fd7cb5a 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -98,12 +98,16 @@
     return errors
   }
 
+  let fromPrimary
+  $: {
+    if (!fromPrimary && fromTable) {
+      fromPrimary = fromTable.primary[0]
+    }
+  }
   $: isManyToMany =
     fromRelationship?.relationshipType === RelationshipTypes.MANY_TO_MANY
   $: isManyToOne =
     fromRelationship?.relationshipType === RelationshipTypes.MANY_TO_ONE
-  $: fromPrimary =
-    !fromPrimary && fromTable ? fromTable.primary[0] : fromPrimary
   $: tableOptions = plusTables.map(table => ({
     label: table.name,
     value: table._id,