diff --git a/assets/core/networking/scripts/NetworkManager.gd b/assets/core/networking/scripts/NetworkManager.gd
index 1198861..4d47371 100644
--- a/assets/core/networking/scripts/NetworkManager.gd
+++ b/assets/core/networking/scripts/NetworkManager.gd
@@ -322,13 +322,13 @@ func read_p2p_packet() -> void:
 
 func register_node(node: Node) -> String:
 	var uuid = generate_uuid()
-	uuid_counter += 1
+	node_map[uuid] = node
 	return uuid
 
 
 func generate_uuid() -> String:
-	var uuid = str(Time.get_unix_time_from_system()) + "-" + str(Time.get_ticks_msec())
-	return uuid	
+	uuid_counter += 1
+	return uuid_counter
 
 
 func request_player_avatar(user_id: int, size: int = 128) -> void: