diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp
index a98a2f8c7..cfe1f9c0a 100644
--- a/src/game/server/teams.cpp
+++ b/src/game/server/teams.cpp
@@ -1111,7 +1111,14 @@ void CGameTeams::SetClientInvited(int Team, int ClientID, bool Invited)
 
 void CGameTeams::KillSavedTeam(int ClientID, int Team)
 {
-	KillTeam(Team, -1);
+	if(g_Config.m_SvSoloServer || !g_Config.m_SvTeam)
+	{
+		GameServer()->m_apPlayers[ClientID]->KillCharacter(WEAPON_SELF, true);
+	}
+	else
+	{
+		KillTeam(Team, -1);
+	}
 }
 
 void CGameTeams::ResetSavedTeam(int ClientID, int Team)