diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
index 981ddac890..35611c65b1 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
@@ -141,7 +141,7 @@ class RecipientProvider {
         title = context.getString(R.string.RecipientProvider_unnamed_group);
       }
 
-      if (groupRecord.get().getAvatarId() != 0) {
+      if (groupRecord.get().getAvatar() != null && groupRecord.get().getAvatar().length > 0) {
         avatarId = groupRecord.get().getAvatarId();
       }