diff --git a/ts/editor/rich-text-input/transform.ts b/ts/editor/rich-text-input/transform.ts
index 33ce0afb8..a49bf432e 100644
--- a/ts/editor/rich-text-input/transform.ts
+++ b/ts/editor/rich-text-input/transform.ts
@@ -19,7 +19,7 @@ function adjustInputHTML(html: string): string {
 
 function adjustInputFragment(fragment: DocumentFragment): void {
     if (nodeContainsInlineContent(fragment)) {
-        fragment.appendChild(document.createElement("br"));
+        fragment.append(document.createElement("br"));
     }
 }
 
@@ -35,12 +35,16 @@ export function storedToFragment(storedHTML: string): DocumentFragment {
 
 function adjustOutputFragment(fragment: DocumentFragment): void {
     if (
-        fragment.hasChildNodes() &&
-        nodeIsElement(fragment.lastChild!) &&
         nodeContainsInlineContent(fragment) &&
-        fragment.lastChild!.tagName === "BR"
+        fragment.lastChild &&
+        nodeIsElement(fragment.lastChild) &&
+        fragment.lastChild.tagName === "BR"
     ) {
-        fragment.lastChild!.remove();
+        fragment.lastChild.remove();
+    }
+
+    for (const divElement of fragment.querySelectorAll("div:empty")) {
+        divElement.remove();
     }
 }