diff --git a/src/map_handler.gd b/src/map_handler.gd
index 47fa25e3..1110ac7d 100644
--- a/src/map_handler.gd
+++ b/src/map_handler.gd
@@ -4,8 +4,6 @@ class_name MapHandler extends Node
 @export var load_player := true
 
 func _ready():
-	GameManager.instance.load_player()
-
 	match MultiplayerManager.instance.status:
 		MultiplayerManager.Status.CLIENT:
 			var player_name := MultiplayerManager.instance.player_name
@@ -13,4 +11,8 @@ func _ready():
 			if player_name == null:
 				# Should send the player back to the Main Menu to fill out the name.
 				return
-			MultiplayerManager.instance.handler.register_player(player_name)
+
+			MultiplayerManager.instance.myClient.start_client()
+			return
+
+	GameManager.instance.load_player()