diff --git a/scenes/main.gd b/scenes/main.gd
index f4c54c8..d5cb458 100644
--- a/scenes/main.gd
+++ b/scenes/main.gd
@@ -607,6 +607,10 @@ func _start_game():
 		if LobbyManager.game_mode == "Stop n Go" and stop_n_go_manager:
 			stop_n_go_manager.setup_mission_tiles()
 			
+		# Spawn Static Tektons BEFORE countdown (Free Mode only)
+		if LobbyManager.game_mode != "Stop n Go":
+			spawn_static_tektons()
+			
 		await _start_pre_game_countdown()
 		
 		GameStateManager.start_game()
@@ -791,9 +795,6 @@ func spawn_tekton_npc():
 	var enhanced_gridmap = $EnhancedGridMap
 	if not enhanced_gridmap: return
 	
-	# Spawn Static Tektons (Using Manager)
-	spawn_static_tektons()
-	
 	# Spawn 3 Roaming Tektons
 	var spawned_count = 0
 	var attempts = 0