diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7342ec7f..7d75ade3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,7 @@ option(CROWBAR_DELAY_FIX "Enable crowbar attack delay fix" OFF)
 option(CROWBAR_FIX_RAPID_CROWBAR "Enable rapid crowbar fix" OFF)
 option(GAUSS_OVERCHARGE_FIX "Enable gauss overcharge fix" OFF)
 option(TRIPMINE_BEAM_DUPLICATION_FIX "Enable fix of tripmine beam duplication on level transition" OFF)
+option(HANDGRENADE_DEPLOY_FIX "Enable handgrenade deploy animation fix after finishing a throw" OFF)
 option(OEM_BUILD "Enable OEM Build" OFF)
 option(HLDEMO_BUILD "Enable Demo Build" OFF)
 
@@ -142,6 +143,11 @@ if(TRIPMINE_BEAM_DUPLICATION_FIX)
 	add_definitions(-DTRIPMINE_BEAM_DUPLICATION_FIX)
 endif()
 
+if(HANDGRENADE_DEPLOY_FIX)
+	message(STATUS "Handgrenade deploy animation fix enabled")
+	add_definitions(-DHANDGRENADE_DEPLOY_FIX)
+endif()
+
 if(OEM_BUILD)
 	message(STATUS "OEM build enabled")
 	add_definitions(-DOEM_BUILD)
diff --git a/dlls/handgrenade.cpp b/dlls/handgrenade.cpp
index 0e9fde30..f9f360ec 100644
--- a/dlls/handgrenade.cpp
+++ b/dlls/handgrenade.cpp
@@ -173,7 +173,9 @@ void CHandGrenade::WeaponIdle( void )
 		// player "shoot" animation
 		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
 
+#if !HANDGRENADE_DEPLOY_FIX
 		m_flReleaseThrow = 0.0f;
+#endif
 		m_flStartThrow = 0.0f;
 		m_flNextPrimaryAttack = GetNextAttackDelay( 0.5f );
 		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5f;