diff --git a/src/User.c b/src/User.c
index 2777d79..018e046 100644
--- a/src/User.c
+++ b/src/User.c
@@ -967,6 +967,7 @@ UserIdParse(char *id, char *defaultServer)
                 Free(userId->localpart);
             }
             Free(userId);
+            userId = NULL;
         }
     }
     else