diff --git a/game/client/cstrike/c_cs_player.cpp b/game/client/cstrike/c_cs_player.cpp
index 46b49133a2..fcc3df063a 100644
--- a/game/client/cstrike/c_cs_player.cpp
+++ b/game/client/cstrike/c_cs_player.cpp
@@ -1713,13 +1713,6 @@ void C_CSPlayer::UpdateClientSideAnimation()
 		FrameAdvance( 0.0f ); // 0 means to use the time we last advanced instead of a constant
 	}
 
-	// Update the animation data. It does the local check here so this works when using
-	// a third-person camera (and we don't have valid player angles).
-	if ( this == C_CSPlayer::GetLocalCSPlayer() )
-		m_PlayerAnimState->Update( EyeAngles()[YAW], m_angEyeAngles[PITCH] );
-	else
-		m_PlayerAnimState->Update( m_angEyeAngles[YAW], m_angEyeAngles[PITCH] );
-
 	if ( GetSequence() != -1 )
 	{
 		// latch old values
@@ -2273,7 +2266,14 @@ void C_CSPlayer::Simulate( void )
 		}
 	}
 
-	BaseClass::Simulate();
+    BaseClass::Simulate();
+
+	// Update the animation data. It does the local check here so this works when using
+	// a third-person camera (and we don't have valid player angles).
+	if ( this == C_CSPlayer::GetLocalCSPlayer() )
+		m_PlayerAnimState->Update( EyeAngles()[YAW], m_angEyeAngles[PITCH] );
+	else
+		m_PlayerAnimState->Update( m_angEyeAngles[YAW], m_angEyeAngles[PITCH] );
 }
 
 void C_CSPlayer::ReleaseFlashlight( void )
diff --git a/game/server/cstrike/cs_player.cpp b/game/server/cstrike/cs_player.cpp
index 5619504ad6..53fbf13cdd 100644
--- a/game/server/cstrike/cs_player.cpp
+++ b/game/server/cstrike/cs_player.cpp
@@ -418,7 +418,7 @@ CCSPlayer::CCSPlayer()
 {
 	m_PlayerAnimState = CreatePlayerAnimState( this, this, LEGANIM_9WAY, true );
 
-	UseClientSideAnimation();
+	// UseClientSideAnimation();
 
 	m_iLastWeaponFireUsercmd = 0;
 	m_iAddonBits = 0;
diff --git a/game/server/cstrike/hostage/cs_simple_hostage.cpp b/game/server/cstrike/hostage/cs_simple_hostage.cpp
index 3e254b73aa..9a6b2a5f28 100644
--- a/game/server/cstrike/hostage/cs_simple_hostage.cpp
+++ b/game/server/cstrike/hostage/cs_simple_hostage.cpp
@@ -103,7 +103,7 @@ CHostage::CHostage()
 {
 	g_Hostages.AddToTail( this );
 	m_PlayerAnimState = CreateHostageAnimState( this, this, LEGANIM_8WAY, false );
-	UseClientSideAnimation();
+	// UseClientSideAnimation();
 	SetBloodColor( BLOOD_COLOR_RED );
 }