diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 7f9b92c01d..961af98d39 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -16,14 +16,14 @@
   let measured = false
 
   $: definition = $componentStore.selectedComponentDefinition
-  $: showBar = definition?.showSettingsBar !== false && !$dndIsDragging
+  $: showBar =
+    definition?.showSettingsBar !== false && !$dndIsDragging && definition
   $: {
     if (!showBar) {
       measured = false
     }
   }
   $: settings = getBarSettings(definition)
-
   $: isScreen =
     $builderStore.selectedComponentId === $builderStore.screen?.props?._id