diff --git a/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx b/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
index 484f2bd3e7aa..3f5e774c74f1 100644
--- a/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
+++ b/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
@@ -8,6 +8,10 @@ import { JsonForm } from './json-form';
 export function CustomStepControls({ dataSchema }: { dataSchema: ControlsMetadata['dataSchema'] }) {
   const [isEditorOpen, setIsEditorOpen] = useState(true);
 
+  if (!dataSchema) {
+    return null;
+  }
+
   return (
     <Collapsible
       open={isEditorOpen}