diff --git a/src/server.js b/src/server.js
index 76e6ac2b..de8c90e5 100644
--- a/src/server.js
+++ b/src/server.js
@@ -237,7 +237,6 @@ function initializeClient(socket, client, token, lastMessage) {
 	socket.on("disconnect", function() {
 		client.clientDetach(socket.id);
 	});
-	client.clientAttach(socket.id, token);
 
 	socket.on(
 		"input",
@@ -429,6 +428,8 @@ function initializeClient(socket, client, token, lastMessage) {
 	socket.join(client.id);
 
 	const sendInitEvent = (tokenToSend) => {
+		client.clientAttach(socket.id, token);
+
 		let networks = client.networks;
 
 		if (lastMessage > -1) {