diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp
index e125375bd..1eba446ba 100644
--- a/src/game/client/components/nameplates.cpp
+++ b/src/game/client/components/nameplates.cpp
@@ -14,23 +14,7 @@
 #include "controls.h"
 #include "nameplates.h"
 
-void CNamePlates::RenderNameplate(
-	const CNetObj_Character *pPrevChar,
-	const CNetObj_Character *pPlayerChar,
-	const CNetObj_PlayerInfo *pPlayerInfo)
-{
-	int ClientId = pPlayerInfo->m_ClientId;
-
-	vec2 Position;
-	if(ClientId >= 0 && ClientId < MAX_CLIENTS)
-		Position = m_pClient->m_aClients[ClientId].m_RenderPos;
-	else
-		Position = mix(vec2(pPrevChar->m_X, pPrevChar->m_Y), vec2(pPlayerChar->m_X, pPlayerChar->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
-
-	RenderNameplatePos(Position, pPlayerInfo, 1.0f);
-}
-
-void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha)
+void CNamePlates::RenderNameplate(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha)
 {
 	int ClientId = pPlayerInfo->m_ClientId;
 
@@ -328,7 +312,7 @@ void CNamePlates::OnRender()
 			// don't render offscreen
 			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
 			{
-				RenderNameplatePos(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true);
+				RenderNameplate(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true);
 			}
 		}
 		if(m_pClient->m_Snap.m_aCharacters[i].m_Active)
@@ -338,10 +322,7 @@ void CNamePlates::OnRender()
 			// don't render offscreen
 			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
 			{
-				RenderNameplate(
-					&m_pClient->m_Snap.m_aCharacters[i].m_Prev,
-					&m_pClient->m_Snap.m_aCharacters[i].m_Cur,
-					pInfo);
+				RenderNameplate(m_pClient->m_aClients[i].m_RenderPos, pInfo, 1.0f, false);
 			}
 		}
 	}
diff --git a/src/game/client/components/nameplates.h b/src/game/client/components/nameplates.h
index b8b81e2e3..48dc3dfff 100644
--- a/src/game/client/components/nameplates.h
+++ b/src/game/client/components/nameplates.h
@@ -42,11 +42,7 @@ struct SPlayerNamePlate
 
 class CNamePlates : public CComponent
 {
-	void RenderNameplate(
-		const CNetObj_Character *pPrevChar,
-		const CNetObj_Character *pPlayerChar,
-		const CNetObj_PlayerInfo *pPlayerInfo);
-	void RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha = false);
+	void RenderNameplate(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha);
 
 	SPlayerNamePlate m_aNamePlates[MAX_CLIENTS];