diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 03afd7c607..4d51688481 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -131,6 +131,8 @@ public class ConversationListItem extends RelativeLayout {
   }
 
   private void setContactPhoto(final Recipient recipient) {
+    if (recipient == null) return;
+
     if (isBadgeEnabled()) {
       contactPhotoBadge.setImageBitmap(recipient.getContactPhoto());
       contactPhotoBadge.assignContactFromPhone(recipient.getNumber(), true);