diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index d083cf3999..1e5bfde801 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -599,10 +599,11 @@
                 blockObject.layout = layoutEntry;
                 blockObject.__watchers = [];
 
-                layoutEntry.settings = null;
                 if (blockConfiguration.settingsElementTypeKey) {
                     var settingsScaffold = this.getScaffoldFromKey(blockConfiguration.settingsElementTypeKey);
                     if (settingsScaffold !== null) {
+
+                        layoutEntry.settings = layoutEntry.settings || {};
                         
                         blockObject.settingsData = layoutEntry.settings;