diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
index e2661492d..ac475f3c8 100644
--- a/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
+++ b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
@@ -363,6 +363,9 @@ function GameConnection::onDrop(%this, %reason)
    if($missionRunning)
    {
       %hasGameMode = callGamemodeFunction("onClientLeaveGame", %this);
+      // Cleanup the player
+      if (isObject(%client.player))
+         %client.player.delete();
    }
    
    removeFromServerGuidList( %this.guid );