diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 337d08ef3b..0807e23e44 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -448,8 +448,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
                       new LinkedList<String>(newMembers));
 
     groupDatabase.updateTitle(groupId, groupName);
-    groupDatabase.updateAvatar(groupId, avatar);
-
+    if (avatar != null) groupDatabase.updateAvatar(groupId, avatar);
 
     return handlePushOperation(groupId, groupName, avatar, memberE164Numbers);
   }