diff --git a/src/WebformBuilder.js b/src/WebformBuilder.js
index e7d872338b..1bd3319bf0 100644
--- a/src/WebformBuilder.js
+++ b/src/WebformBuilder.js
@@ -1444,7 +1444,8 @@ export default class WebformBuilder extends Component {
           helplinks: this.helplinks,
         }));
         this.editForm.attach(this.componentEdit.querySelector(`[${this._referenceAttributeName}="editForm"]`));
-        this.updateComponent(this.editForm.submission.data ?? component);
+        const editFormData = this.editForm.submission?.data;
+        this.updateComponent(editFormData?.componentJson || editFormData || component);
         this.attachEditComponentControls(component, parent, isNew, original, ComponentClass);
       });
     });