diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index b30b181b6..1bf2c316b 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -732,6 +732,8 @@ public class GeyserSession implements CommandSender {
                         address = handshakePacket.getHostname();
                     }
 
+                    System.out.println((address + addressSuffix).getBytes(StandardCharsets.UTF_8).length);
+
                     event.setPacket(new HandshakePacket(
                             handshakePacket.getProtocolVersion(),
                             address + addressSuffix,
@@ -802,9 +804,11 @@ public class GeyserSession implements CommandSender {
                             SkinManager.handleBedrockSkin(playerEntity, clientData);
                         }
 
-                        // We'll send the skin upload a bit after the handshake packet (aka this packet),
-                        // because otherwise the global server returns the data too fast.
-                        getAuthData().upload(connector);
+                        if (remoteAuthType == AuthType.FLOODGATE) {
+                            // We'll send the skin upload a bit after the handshake packet (aka this packet),
+                            // because otherwise the global server returns the data too fast.
+                            getAuthData().upload(connector);
+                        }
                     }
 
                     PacketTranslatorRegistry.JAVA_TRANSLATOR.translate(event.getPacket().getClass(), event.getPacket(), GeyserSession.this);