diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 78c83519..4f84ba6b 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1553,7 +1553,6 @@ Messenger *new_messenger(uint8_t ipv6enabled)
         return NULL;
     }
 
-    new_keys(m->net_crypto);
     m_set_statusmessage(m, (uint8_t *)"Online", sizeof("Online"));
 
     friendreq_init(&(m->fr), m->net_crypto);
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index a37d99da..aec2a9e7 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -818,6 +818,7 @@ Net_Crypto *new_net_crypto(Networking_Core *net)
         return NULL;
     }
 
+    new_keys(temp);
     return temp;
 }