diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
index c67719cfa7..ee10b3926d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
@@ -509,7 +509,8 @@ object ClosedGroupsProtocolV2 {
         val updatedMemberList = members - senderPublicKey
         val userLeft = userPublicKey == senderPublicKey
 
-        if (didAdminLeave || userLeft) {
+        // if the admin left, we left, or we are the only remaining member: remove the group
+        if (didAdminLeave || userLeft || updatedMemberList.size == 1) {
             disableLocalGroupAndUnsubscribe(context, apiDB, groupPublicKey, groupDB, groupID, userPublicKey)
         } else {
             val isCurrentUserAdmin = admins.contains(userPublicKey)