diff --git a/src/game/shared/tf/tf_player_shared.cpp b/src/game/shared/tf/tf_player_shared.cpp
index 42d0b829b55..8dc22dcae61 100644
--- a/src/game/shared/tf/tf_player_shared.cpp
+++ b/src/game/shared/tf/tf_player_shared.cpp
@@ -8316,6 +8316,8 @@ void CTFPlayerShared::CompleteDisguise( void )
 	m_pOuter->UpdateModel();
 	m_pOuter->ClearExpression();
 
+	RemoveDisguiseWeapon();
+
 	FindDisguiseTarget();
 
 	if ( GetDisguiseTarget() )