From 12a9466cd7210ec079c58d66f3cf32b7b0641e6d Mon Sep 17 00:00:00 2001
From: Mark Drake <mdrake@scyllagroup.com>
Date: Thu, 27 Sep 2018 17:03:24 -0400
Subject: [PATCH] if tinymce has not loaded yet, return the initialized value
 only

---
 .../src/views/propertyeditors/rte/rte.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 5e37bcce5d..212db4fc31 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -377,7 +377,7 @@ angular.module("umbraco")
                 var unsubscribe = $scope.$on("formSubmitting", function () {
                     //TODO: Here we should parse out the macro rendered content so we can save on a lot of bytes in data xfer
                     // we do parse it out on the server side but would be nice to do that on the client side before as well.
-                    if (tinyMceEditor !== undefined && tinyMceEditor != null) {
+                    if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {
                         $scope.model.value = tinyMceEditor.getContent();
                     }
                 });