diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 3eae4f00d4..b72f78bae8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -366,6 +366,8 @@ class ConversationFragment :
       setOnClickListener(null)
       removeOnFocusChangeListener(composeTextEventsListener)
     }
+
+    textDraftSaveDebouncer.clear()
   }
 
   private val viewModel: ConversationViewModel by viewModel {