diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 55e8d1e49f..8617df9baa 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -166,7 +166,9 @@ public class ConversationItem extends LinearLayout {
   }
 
   public void unbind() {
-    mediaThumbnail.clear();
+    if (mediaThumbnail != null) {
+      mediaThumbnail.clear();
+    }
   }
 
   public MessageRecord getMessageRecord() {