diff --git a/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx b/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx
index 8ba2c3a30..4b6dab687 100644
--- a/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx
+++ b/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx
@@ -51,10 +51,13 @@ export const DraftSaver = ({
       )
         return;
 
+      const emptiedDraft = isEmptyRichText(message) ? undefined : message;
+      if (drafts[draftKey]?.message === undefined && emptiedDraft === undefined) return;
+
       const newDrafts: Record<string, Draft | undefined> = {
         ...drafts,
         [draftKey]: {
-          message: isEmptyRichText(message) ? undefined : message,
+          message: emptiedDraft,
           updatedAt: updatedAt || 0,
         },
       };