diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index c77d1f35..fe5d37ea 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -266,9 +266,13 @@ namespace ReallifeGamemode.Server.Extensions
         nameTagColor = -1;
         blipColor = 64;
       }
-      else if (user.Faction != null)
+      else if (user.FactionId != null)
       {
-        nameTagColor = user.FactionId.Value;
+        if(user.FactionId > 3 || (user.FactionId >= 1 && user.FactionId <= 3 && duty))
+        {
+          nameTagColor = user.FactionId.Value;
+        }
+        
         switch (user.FactionId)
         {
           case 1 when duty: