diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index bcce14be..2fa0f200 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -78,6 +78,7 @@ static int _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *cons
 
 void connection_init(void)
 {
+    xmpp_initialize();
     conn.conn_status = JABBER_STARTED;
     conn.presence_message = NULL;
     conn.xmpp_conn = NULL;
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index 8634a585..2ea0bcc2 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -96,7 +96,6 @@ session_init(void)
     connection_init();
     presence_sub_requests_init();
     caps_init();
-    xmpp_initialize();
 }
 
 jabber_conn_status_t