diff --git a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
index 0857d8f26..8a97369a3 100644
--- a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -287,7 +287,10 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         groupChatId = rpc.createGroupChat(accId, groupName, false);
       }
 
-      rpc.setChatDescription(accId, groupChatId, getChatDescription());
+      String description = getChatDescription();
+      if (!description.isEmpty()) {
+        rpc.setChatDescription(accId, groupChatId, description);
+      }
     } catch (RpcException e) {
       Log.e(TAG, "RPC error", e);
       return;
@@ -353,7 +356,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     return ret;
   }
 
-  private @Nullable String getChatDescription() {
+  private String getChatDescription() {
     return chatDescription.getText() != null ? chatDescription.getText().toString().trim() : "";
   }