diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx
index 525feaace..df37cb3fc 100644
--- a/packages/pl-fe/src/features/compose/components/compose-form.tsx
+++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx
@@ -278,6 +278,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
 
     return () => {
       document.removeEventListener('click', handleClick, true);
+      window.onbeforeunload = null;
     };
   }, []);
 
diff --git a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx
index 78314a44b..d4254c3c3 100644
--- a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx
+++ b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx
@@ -177,6 +177,14 @@ const StatePlugin: React.FC<IStatePlugin> = ({ composeId, isWysiwyg }) => {
         checkHashtagCasingSuggestions(editorState);
         getQuoteSuggestions(plainText);
         detectLanguage(plainText);
+        if (isEmpty) {
+          window.onbeforeunload = null;
+        } else {
+          window.onbeforeunload = (event) => {
+            event.preventDefault();
+            event.returnValue = true;
+          };
+        }
       });
     });
   }, [editor]);