diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 2adbd870..b65f09ae 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1206,8 +1206,10 @@ int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_gro
 
     IP_Port friend_ip = get_friend_ipport(m, friendnumber);
 
-    if (friend_ip.ip.family == 0)
+    if (friend_ip.ip.family == 0) {
+        del_groupchat(m, groupnum);
         return -1;
+    }
 
     id_copy(data, friend_group_public_key);
     id_copy(data + crypto_box_PUBLICKEYBYTES, m->chats[groupnum]->self_public_key);
@@ -1218,6 +1220,7 @@ int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_gro
         return groupnum;
     }
 
+    del_groupchat(m, groupnum);
     return -1;
 }