diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index dd5b266d13..7d8c6075c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -285,6 +285,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   @Override
   protected void onDetachedFromWindow() {
     ConversationSwipeAnimationHelper.update(this, 0f, 1f);
+    unbind();
     super.onDetachedFromWindow();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 4f3a91ad66..45f421a325 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -87,6 +87,12 @@ public class ConversationUpdateItem extends LinearLayout
     bind(messageRecord, locale);
   }
 
+  @Override
+  protected void onDetachedFromWindow() {
+    unbind();
+    super.onDetachedFromWindow();
+  }
+
   @Override
   public void setEventListener(@Nullable EventListener listener) {
     // No events to report yet