diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 527b091c..2a06a5a8 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -6,13 +6,9 @@
     @ToolbarContent
 </div>
 <div @ref="@EditorElement">
-    @EditorContent
 </div>
 
 @code {
-    [Parameter]
-    public RenderFragment EditorContent { get; set; }
-
     [Parameter]
     public RenderFragment ToolbarContent { get; set; }
 
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 42a9763c..f534eb7f 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -41,9 +41,6 @@
                         <button class="ql-link"></button>
                     </span>
                 </ToolbarContent>
-                <EditorContent>
-                    @((MarkupString)@content)
-                </EditorContent>
             </RichTextEditor>
         </td>
     </tr>
@@ -79,6 +76,8 @@
                 createdon = htmltext.CreatedOn;
                 modifiedby = htmltext.ModifiedBy;
                 modifiedon = htmltext.ModifiedOn;
+
+                await RichTextEditorHtml.LoadContent(content);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/wwwroot/js/interop.js b/Oqtane.Client/wwwroot/js/interop.js
index cc8f7378..88c545fa 100644
--- a/Oqtane.Client/wwwroot/js/interop.js
+++ b/Oqtane.Client/wwwroot/js/interop.js
@@ -154,8 +154,7 @@ window.interop = {
         return editorElement.__quill.root.innerHTML;
     },
     loadQuillContent: function (editorElement, editorContent) {
-        content = JSON.parse(editorContent);
-        return editorElement.__quill.setContents(content, 'api');
+        return editorElement.__quill.root.innerHTML = editorContent;
     },
     enableQuillEditor: function (editorElement, mode) {
         editorElement.__quill.enable(mode);
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index cc8f7378..88c545fa 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -154,8 +154,7 @@ window.interop = {
         return editorElement.__quill.root.innerHTML;
     },
     loadQuillContent: function (editorElement, editorContent) {
-        content = JSON.parse(editorContent);
-        return editorElement.__quill.setContents(content, 'api');
+        return editorElement.__quill.root.innerHTML = editorContent;
     },
     enableQuillEditor: function (editorElement, mode) {
         editorElement.__quill.enable(mode);