diff --git a/src/main/java/ua/nanit/limbo/connection/PacketHandler.java b/src/main/java/ua/nanit/limbo/connection/PacketHandler.java
index f1bacda1..e0cf0636 100644
--- a/src/main/java/ua/nanit/limbo/connection/PacketHandler.java
+++ b/src/main/java/ua/nanit/limbo/connection/PacketHandler.java
@@ -100,7 +100,9 @@ public void handle(ClientConnection conn, PacketLoginStart packet) {
 
         if (!server.getConfig().getInfoForwarding().isModern()) {
             conn.getGameProfile().setUsername(packet.getUsername());
-            conn.getGameProfile().setUuid(UuidUtil.getOfflineModeUuid(packet.getUsername()));
+            if (conn.getGameProfile().getUuid() == null) {
+                conn.getGameProfile().setUuid(UuidUtil.getOfflineModeUuid(packet.getUsername()));
+            }
         }
 
         conn.fireLoginSuccess();