diff --git a/code/game/g_client.c b/code/game/g_client.c
index 2e968aff..68ad987a 100644
--- a/code/game/g_client.c
+++ b/code/game/g_client.c
@@ -626,7 +626,7 @@ static void ClientCleanName(const char *in, char *out, int outSize)
 			
 			spaces++;
 		}
-		if(outpos > 0 && out[outpos - 1] == Q_COLOR_ESCAPE)
+		else if(outpos > 0 && out[outpos - 1] == Q_COLOR_ESCAPE)
 		{
 			if(Q_IsColorString(&out[outpos - 1]))
 			{