diff --git a/mp/src/game/server/sdk/sdk_player.cpp b/mp/src/game/server/sdk/sdk_player.cpp
index e2b3430c9..1fd4a5569 100644
--- a/mp/src/game/server/sdk/sdk_player.cpp
+++ b/mp/src/game/server/sdk/sdk_player.cpp
@@ -3787,7 +3787,7 @@ bool CSDKPlayer::WantsLagCompensationOnEntity( const CBasePlayer *pPlayer, const
 {
 	// No need to lag compensate at all if we're not attacking in this command and
 	// we haven't attacked recently.
-	if ( !( pCmd->buttons & IN_ATTACK ) && (pCmd->command_number - m_iLastWeaponFireUsercmd > 5) )
+	if ( !( pCmd->buttons & (IN_ATTACK | IN_ATTACK2)) && (pCmd->command_number - m_iLastWeaponFireUsercmd > 5) )
 		return false;
 
 	if (!pPlayer->IsAlive())
diff --git a/mp/src/game/shared/sdk/sdk_weapon_melee.cpp b/mp/src/game/shared/sdk/sdk_weapon_melee.cpp
index 4d067df29..2e52d2024 100644
--- a/mp/src/game/shared/sdk/sdk_weapon_melee.cpp
+++ b/mp/src/game/shared/sdk/sdk_weapon_melee.cpp
@@ -112,12 +112,6 @@ void CWeaponSDKMelee::ItemPostFrame( void )
 
 void CWeaponSDKMelee::PrimaryAttack()
 {
-	
-#ifndef CLIENT_DLL
-	CSDKPlayer *pPlayer = ToSDKPlayer( GetPlayerOwner() );
-	pPlayer->NoteWeaponFired();
-#endif
-
 	StartSwing( false );
 }
 
diff --git a/mp/src/game/shared/sdk/weapon_sdkbase.cpp b/mp/src/game/shared/sdk/weapon_sdkbase.cpp
index 6097a62a9..5a8021f9e 100644
--- a/mp/src/game/shared/sdk/weapon_sdkbase.cpp
+++ b/mp/src/game/shared/sdk/weapon_sdkbase.cpp
@@ -453,6 +453,8 @@ void CWeaponSDKBase::StartSwing(bool bIsSecondary, bool bIsStockAttack)
 	if (pOwner->GetCurrentTime() < m_flNextBrawlTime)
 		return;
 
+	pOwner->NoteWeaponFired();
+
 	bool bNeedsUnpause = false;
 	if (m_bInReload)
 	{