diff --git a/source/client/hud.qc b/source/client/hud.qc
index 65ad23a..133f6b0 100644
--- a/source/client/hud.qc
+++ b/source/client/hud.qc
@@ -1989,7 +1989,7 @@ void(float width, float height) HUD_Draw =
 		return;
 	}
 	
-	if ((getstatf(STAT_HEALTH) > 1) && !score_show)
+	if ((getstatf(STAT_HEALTH) > 1) && !score_show && !game_over)
 	{
 		Draw_Crosshair();
 
diff --git a/source/server/damage.qc b/source/server/damage.qc
index 677fa4b..e13e55e 100644
--- a/source/server/damage.qc
+++ b/source/server/damage.qc
@@ -157,6 +157,13 @@ void() EndGameSetup =
 		NotifyGameEnd();
 	}
 	game_over = true;
+	Player_RemoveScore(self, self.points);
+	Player_AddScore(self, self.score, false);
+	for (float i = 0; i < MAX_PLAYER_WEAPONS; ++i)
+	{
+		Weapon_RemoveWeapon(i);
+	}
+  return;
 }
 
 float() push_away_zombies;