diff --git a/sp/src/game/server/basecombatcharacter.cpp b/sp/src/game/server/basecombatcharacter.cpp
index 668f1525eac..c576ded034f 100644
--- a/sp/src/game/server/basecombatcharacter.cpp
+++ b/sp/src/game/server/basecombatcharacter.cpp
@@ -4308,7 +4308,8 @@ void CBaseCombatCharacter::InputHolsterAndDestroyWeapon( inputdata_t &inputdata
 		if (pWeapon->GetActivity() == ACT_VM_HOLSTER)
 		{
 			// Remove when holster is finished
-			pWeapon->ThinkSet( &CBaseEntity::SUB_Remove, gpGlobals->curtime + pWeapon->GetViewModelSequenceDuration() );
+			pWeapon->SetThink( &CBaseEntity::SUB_Remove );
+			pWeapon->SetNextThink( gpGlobals->curtime + pWeapon->GetViewModelSequenceDuration() );
 		}
 		else
 		{