From 2db5496dd6ccb233d40fbdc6b9e45feb5bb1cdf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 23 Jun 2020 14:41:20 +0200
Subject: [PATCH] make sure settings object exists

---
 .../src/common/services/blockeditormodelobject.service.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;