diff --git a/src/game/shared/tf/tf_player_shared.cpp b/src/game/shared/tf/tf_player_shared.cpp
index a2c26261d7..1fc6a2bc49 100644
--- a/src/game/shared/tf/tf_player_shared.cpp
+++ b/src/game/shared/tf/tf_player_shared.cpp
@@ -7361,6 +7361,11 @@ void CTFPlayerShared::OnRemoveStunned( void )
 #endif
 
 	m_pOuter->TeamFortress_SetSpeed();
+
+	if ( m_pOuter->GetActiveWeapon() && !InCond( TF_COND_TAUNTING ) && !InCond( TF_COND_HALLOWEEN_KART ) )
+	{
+		m_pOuter->GetActiveWeapon()->SetWeaponVisible( true );
+	}
 }
 
 //-----------------------------------------------------------------------------