diff --git a/Assets/Scripts/Game/Systems/GameMode/GameModeSystemServer.cs b/Assets/Scripts/Game/Systems/GameMode/GameModeSystemServer.cs
index 6ccd953f5..b0ab66094 100644
--- a/Assets/Scripts/Game/Systems/GameMode/GameModeSystemServer.cs
+++ b/Assets/Scripts/Game/Systems/GameMode/GameModeSystemServer.cs
@@ -244,7 +244,12 @@ protected override void OnUpdate()
                             var rotation = predictedState.velocity.magnitude > 0.01f ? Quaternion.LookRotation(predictedState.velocity.normalized) : Quaternion.identity;
 
                             CharacterDespawnRequest.Create(PostUpdateCommands, controlledEntity);
-                            CharacterSpawnRequest.Create(PostUpdateCommands, charControl.characterType, predictedState.position, rotation, playerEntity);
+
+                            if (charControl.characterType == 1000)
+                                SpectatorCamSpawnRequest.Create(PostUpdateCommands, predictedState.position, rotation, playerEntity);
+                            else
+                                CharacterSpawnRequest.Create(PostUpdateCommands, charControl.characterType, predictedState.position, rotation, playerEntity);
+
                         }
                         player.controlledEntity = Entity.Null;
                     }