diff --git a/src/groupchat.c b/src/groupchat.c
index 471a634..55a5f17 100644
--- a/src/groupchat.c
+++ b/src/groupchat.c
@@ -60,7 +60,9 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
             groupchats[i].peer_name_lengths = malloc(sizeof(uint16_t));
             groupchats[i].oldpeer_name_lengths = malloc(sizeof(uint16_t));
 
-            /* temp fix */
+            memset(groupchats[i].peer_names, 0, sizeof(uint8_t) * TOX_MAX_NAME_LENGTH);
+            memset(groupchats[i].peer_name_lengths, 0, sizeof(uint16_t));
+
             memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, sizeof(UNKNOWN_NAME));
             groupchats[i].oldpeer_name_lengths[0] = (uint16_t) strlen(UNKNOWN_NAME);
 
@@ -250,6 +252,9 @@ static void copy_peernames(int gnum, uint8_t peerlist[][TOX_MAX_NAME_LENGTH], ui
     groupchats[gnum].peer_name_lengths = malloc(sizeof(uint16_t) * npeers);
     groupchats[gnum].oldpeer_name_lengths = malloc(sizeof(uint16_t) * npeers);
 
+    memset(groupchats[gnum].peer_names, 0, sizeof(uint8_t) * npeers * N);
+    memset(groupchats[gnum].peer_name_lengths, 0, sizeof(uint16_t) * npeers);
+
     if (groupchats[gnum].peer_names == NULL || groupchats[gnum].oldpeer_names == NULL
         || groupchats[gnum].peer_name_lengths == NULL || groupchats[gnum].oldpeer_name_lengths == NULL) {
         endwin();