diff --git a/ReallifeGamemode.Client/Gui/nametags.ts b/ReallifeGamemode.Client/Gui/nametags.ts
index 462bf1a8..4648d30b 100644
--- a/ReallifeGamemode.Client/Gui/nametags.ts
+++ b/ReallifeGamemode.Client/Gui/nametags.ts
@@ -31,20 +31,7 @@ const colors = [
 export default function customNametags() {
 
     mp.nametags.enabled = false;
-    
-
-    mp.events.addDataHandler("nameTagColor", (entity: EntityMp, value) => {
-        if (entity.type === "player") {
-            var player = game.players.at(entity.remoteId);
-
-            let temp = colors.find(c => c.id === value);
-            if (!temp) {
-                player.nametagColor = [255, 255, 255, alpha];
-                return;
-            }
-            player.nametagColor = temp.color;
-        }
-    });
+   
 
 
     mp.events.add('render', (nametags) => {
@@ -64,7 +51,10 @@ export default function customNametags() {
                 var armour = player.getArmour() / 100;
 
                 y -= scale * (0.005 * (screenRes.y / 1080));
-                let color = game.players.at(player.remoteId).nametagColor;
+
+                let colorId = game.players.at(player.remoteId).nametagColor;
+                let color = colors.find(c => c.id === colorId).color;
+
                 mp.game.graphics.drawText(player.name + " (" + player.remoteId + ")", [x, y],
                     {
                         font: 4,
diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts
index 608f34fd..b3409977 100644
--- a/ReallifeGamemode.Client/core/rage-mp/entities.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts
@@ -59,12 +59,18 @@ class RageEntity implements IEntity {
 
 class RagePlayer extends RageEntity implements IPlayer {
     private player: PlayerMp;
-    public nametagColor: number[];
 
     get name(): string {
         return this.player.name;
     }
 
+    get nametagColor(): number {
+        var color = this.player.getVariable("nametagColor");
+        if (!color)
+            return 0;
+        return color;
+    }
+
     get vehicle(): IVehicle {
         if (!this.player) {
             return null;
diff --git a/ReallifeGamemode.Client/game.ts b/ReallifeGamemode.Client/game.ts
index 05a95326..8b1f6883 100644
--- a/ReallifeGamemode.Client/game.ts
+++ b/ReallifeGamemode.Client/game.ts
@@ -53,7 +53,7 @@ interface IPlayer extends IEntity {
     inVehicle: boolean;
     name: string;
     vehicle: IVehicle;
-    nametagColor: number[];
+    nametagColor: number;
 }
 
 interface IObject extends IEntity {