diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp
index 0849fd354..aa0f9302a 100644
--- a/src/g_shared/sbar_mugshot.cpp
+++ b/src/g_shared/sbar_mugshot.cpp
@@ -270,7 +270,8 @@ void FMugShot::Tick(player_t *player)
 			RampageTimer++;
 		}
 	}
-	else
+	// Only reset the rampage timer if the weapon becomes ready to fire.
+	else if((player->WeaponState & (WF_WEAPONREADY|WF_WEAPONREADYALT)))
 	{
 		RampageTimer = 0;
 	}