diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 9a3d2c93..7b303b95 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -3656,6 +3656,11 @@ cmd_join(ProfWin *window, const char *const command, gchar **args)
     jid_destroy(room_arg);
     account_free(account);
 
+    if (account->muc_service) {
+        // then we allocated the memory ourself (see above)
+        free(room);
+    }
+
     return TRUE;
 }