diff --git a/src/game/client/tf/tf_hud_playerstatus.cpp b/src/game/client/tf/tf_hud_playerstatus.cpp
index 9d97ff34b1f..58876f1a5b7 100644
--- a/src/game/client/tf/tf_hud_playerstatus.cpp
+++ b/src/game/client/tf/tf_hud_playerstatus.cpp
@@ -184,7 +184,8 @@ static bool IsMvMRobotDisguise( C_TFPlayer *pPlayer )
 		   TFGameRules() && TFGameRules()->IsMannVsMachineMode() &&
 		   pPlayer->GetTeamNumber() == TF_TEAM_PVE_DEFENDERS &&
 		   pPlayer->m_Shared.InCond( TF_COND_DISGUISED ) &&
-		   pPlayer->m_Shared.GetDisguiseTeam() != pPlayer->GetTeamNumber();
+		   pPlayer->m_Shared.GetDisguiseTeam() != pPlayer->GetTeamNumber() &&
+		   pPlayer->m_Shared.GetDisguisedSkinOverride() == 0; // If the target is a zombie, do not display as robot!
 }
 
 //-----------------------------------------------------------------------------