diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
index b426d9864..2515d5554 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
@@ -103,7 +103,7 @@ class IntentFactory
         val intent = startEditActivity(context)
         intent.putExtra("habitId", habit.id)
         intent.putExtra("habitType", habit.type)
-        intent.putExtra("groupId", habit.groupId)
+        if (habit.groupId != null) intent.putExtra("groupId", habit.groupId)
         return intent
     }