diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
index c8e23cc535..9ec1108985 100644
--- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
@@ -71,7 +71,7 @@
     />
   {/if}
   {#if settings && settings.length > 0}
-    {#each settings as setting}
+    {#each settings as setting (setting.key)}
       {#if canRenderControl(setting)}
         <PropertyControl
           type={setting.type}
@@ -83,8 +83,8 @@
           {componentInstance}
           onChange={val => updateProp(setting.key, val)}
           props={{
-            options: setting.options,
-            placeholder: setting.placeholder,
+            options: setting.options || [],
+            placeholder: setting.placeholder || null,
           }}
           {bindings}
           {componentDefinition}