diff --git a/src/XMPPThread/Stanzas/Message.c b/src/XMPPThread/Stanzas/Message.c
index b9c5810..cd606dc 100644
--- a/src/XMPPThread/Stanzas/Message.c
+++ b/src/XMPPThread/Stanzas/Message.c
@@ -230,8 +230,8 @@ MessageStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
 
     if (StrEquals(type, "error"))
     {
-        char *type, *text, *user, *parsee;
-        char *message, *room;
+        char *type = NULL, *text = NULL, *user = NULL, *parsee = NULL;
+        char *message = NULL, *room = NULL;
 
         from = HashMapGet(stanza->attrs, "from");
         to = HashMapGet(stanza->attrs, "to");
diff --git a/src/XMPPThread/Stanzas/Presence.c b/src/XMPPThread/Stanzas/Presence.c
index 2885714..12c06cd 100644
--- a/src/XMPPThread/Stanzas/Presence.c
+++ b/src/XMPPThread/Stanzas/Presence.c
@@ -156,7 +156,7 @@ PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
         char *trim = ParseeTrimJID(jid);
         char *from = NULL;
         char *room = ParseeGetBridgedRoom(args, stanza);
-        char *decode_from, *real_matrix;
+        char *decode_from = NULL, *real_matrix = NULL;
         char *matrix_user_pl = ParseeEncodeJID(args->config, trim, false);
         char *affiliation = item ? HashMapGet(item->attrs, "affiliation") : NULL;
         char *role = item ? HashMapGet(item->attrs, "role") : NULL;