diff --git a/scenes/world/world.gd b/scenes/world/world.gd
index 55aa075..d87dcb0 100644
--- a/scenes/world/world.gd
+++ b/scenes/world/world.gd
@@ -45,11 +45,14 @@ func _create_test_blocks() -> void:
 func _spawn_player(player_position: Vector3) -> void:
 	if has_node("Player"):
 		$Player.queue_free()
+		await $Player.tree_exited
 
 	var player: Player = player_scene.instantiate()
 	player.position = player_position
+	player.name = "Player"
 	add_child(player)
 
+
 func _initialize_ground() -> void:
 	for x: int in range(-10, 11):
 		for z: int in range(-10, 11):