diff --git a/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs b/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
index 2e41fb60e..c905e6ef6 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
+++ b/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
@@ -2,12 +2,16 @@
   <@labelComponent />
 
   <div class="uk-form-controls">
-    {{component
-      (get-widget this.field.question)
-      field=this.field
-      disabled=false
-      onSave=this.onUpdate
+    {{#let
+      (component (ensure-safe-component (get-widget this.field.question)))
+      as |QuestionComponent|
     }}
+      <QuestionComponent
+        @field={{this.field}}
+        @disabled={{false}}
+        @onSave={{this.onUpdate}}
+      />
+    {{/let}}
   </div>
 
   <@hintComponent />