diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index 507918d92..57bef7314 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -1299,12 +1299,15 @@ void CChat::OnRender()
 				RenderInfo.m_ColorFeet = Line.m_ColorFeet;
 				RenderInfo.m_Size = TeeSize;
 
-				for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+				if(Client()->IsSixup())
 				{
-					RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
-					RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
-					RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
-					RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
+					for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+					{
+						RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
+						RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
+						RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
+						RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
+					}
 				}
 
 				float RowHeight = FontSize() + RealMsgPaddingY;