diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index 1653d5b4..9f7c3eaf 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -878,6 +878,13 @@ void CleanSwitchTeam(int client, int team)
 	}
 	else
 	{
+		// Remove flashlight :)
+		if (gEV_Type == Engine_CSS)
+		{
+			int EF_DIMLIGHT = 4;
+			SetEntProp(client, Prop_Send, "m_fEffects", ~EF_DIMLIGHT & GetEntProp(client, Prop_Send, "m_fEffects"));
+		}
+
 		ChangeClientTeam(client, team);
 	}
 }