diff --git a/cl_dll/ff/c_ff_player.cpp b/cl_dll/ff/c_ff_player.cpp
index 9e79e5085..f2cf0dded 100644
--- a/cl_dll/ff/c_ff_player.cpp
+++ b/cl_dll/ff/c_ff_player.cpp
@@ -1081,7 +1081,7 @@ void C_FFRagdoll::CreateRagdoll()
 		// We can also spawn a valid weapon
 		if (pWeapon && pWeapon->GetWeaponID() < FF_WEAPON_DEPLOYDISPENSER)
 		{
-			C_Gib *pGib = C_Gib::CreateClientsideGib(pWeapon->GetFFWpnData().szWorldModel, pWeapon->GetAbsOrigin(), GetAbsVelocity(), Vector(0, 0, 0), 10.0f);
+			C_Gib *pGib = C_Gib::CreateClientsideGib(pWeapon->GetFFWpnData().szWorldModel, pWeapon->GetAbsOrigin(), GetAbsVelocity(), Vector(0, 0, 0), cl_gib_lifetime.GetFloat());
 
 			if (pGib)
 			{
diff --git a/dlls/ff/ff_player.cpp b/dlls/ff/ff_player.cpp
index 281ce0899..96a434b65 100644
--- a/dlls/ff/ff_player.cpp
+++ b/dlls/ff/ff_player.cpp
@@ -2188,15 +2188,13 @@ void CFFPlayer::CreateRagdollEntity(const CTakeDamageInfo *info)
 
 	// not everything that gets here has an info
 	// when we change class we dont have an inflictor either
+	pRagdoll->m_vecRagdollVelocity = GetAbsVelocity();
 	if ( info ) 
 	{
-		pRagdoll->m_vecRagdollVelocity = GetAbsVelocity();
 		pRagdoll->m_vecForce = info->GetDamageForce();
 	}
 	else
 	{
-		//use whatever the players velocity was
-		pRagdoll->m_vecRagdollVelocity = GetAbsVelocity();
 		pRagdoll->m_vecForce = Vector(0, 0, 0);
 	}