diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
index f0b278da8..691da7a21 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
@@ -3,10 +3,13 @@
   import { Input, Select, Label } from "@budibase/bbui"
 
   export let value
-  $: value = value || {}
   $: model = $backendUiStore.models.find(model => model._id === value?.modelId)
   $: schemaFields = Object.entries(model?.schema ?? {})
 
+  // Ensure any nullish modelId values get set to empty string so
+  // that the select works
+  $: if (value?.modelId == null) value = { modelId: "" }
+
   function setParsedValue(evt, field) {
     const fieldSchema = model?.schema[field]
     if (fieldSchema) {