diff --git a/releases/valve/source/cl_dll/ammo.cpp b/releases/valve/source/cl_dll/ammo.cpp
index 5498b293..bae074e3 100644
--- a/releases/valve/source/cl_dll/ammo.cpp
+++ b/releases/valve/source/cl_dll/ammo.cpp
@@ -288,7 +288,8 @@ void WeaponsResource::SetCurrentWeapon(WEAPON* newWeapon)
 	// && newWeapon != currentWeapon 
 	if(newWeapon != NULL )
 	{ 
-		lastWeapon = currentWeapon;
+		if ( newWeapon != currentWeapon ) 
+		{ lastWeapon = currentWeapon; }
 		//if ( newWeapon != currentWeapon )
 		ServerCmd(newWeapon->szName);
 		g_weaponselect = newWeapon->iId;