diff --git a/src/main/java/net/minecraft/entity/Entity.java b/src/main/java/net/minecraft/entity/Entity.java
index a279ad2..6d6f3d3 100644
--- a/src/main/java/net/minecraft/entity/Entity.java
+++ b/src/main/java/net/minecraft/entity/Entity.java
@@ -10,6 +10,7 @@
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
 
 import org.ultramine.server.EntityType;
 import org.ultramine.server.internal.UMHooks;
@@ -167,7 +168,7 @@
 		this.rand = new Random();
 		this.fireResistance = 1;
 		this.firstUpdate = true;
-		this.entityUniqueID = UUID.randomUUID();
+		this.entityUniqueID = new UUID(ThreadLocalRandom.current().nextLong(), ThreadLocalRandom.current().nextLong());
 		this.myEntitySize = Entity.EnumEntitySize.SIZE_2;
 		this.worldObj = p_i1582_1_;
 		this.setPosition(0.0D, 0.0D, 0.0D);