diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index 1c25c2281..aeb8e9970 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.session;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
@@ -142,6 +143,11 @@ public class GeyserSession implements GeyserConnection, CommandSender {
     private AuthData authData;
     @Setter
     private BedrockClientData clientData;
+    /**
+     * Used for Floodgate skin uploading
+     */
+    @Setter
+    private JsonNode certChainData;
 
     /* Setter for GeyserConnect */
     @Setter
diff --git a/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java b/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java
index 802ee3ca0..99b7ae3af 100644
--- a/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java
+++ b/core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java
@@ -25,18 +25,7 @@
 
 package org.geysermc.geyser.session.auth;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import org.geysermc.geyser.GeyserImpl;
-
 import java.util.UUID;
 
-public record AuthData(String name, UUID uuid, String xuid,
-                       JsonNode certChainData, String clientData) {
-
-    public void upload(GeyserImpl geyser) {
-        // we can't upload the skin in LoginEncryptionUtil since the global server would return
-        // the skin too fast, that's why we upload it after we know for sure that the target server
-        // is ready to handle the result of the global server
-        geyser.getSkinUploader().uploadSkin(certChainData, clientData);
-    }
+public record AuthData(String name, UUID uuid, String xuid) {
 }
diff --git a/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java b/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java
index b3601f6c3..07dd38491 100644
--- a/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java
+++ b/core/src/main/java/org/geysermc/geyser/session/auth/BedrockClientData.java
@@ -25,9 +25,11 @@
 
 package org.geysermc.geyser.session.auth;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
+import lombok.Setter;
 import org.geysermc.floodgate.util.DeviceOs;
 import org.geysermc.floodgate.util.InputMode;
 import org.geysermc.floodgate.util.UiProfile;
@@ -107,6 +109,10 @@ public final class BedrockClientData {
     @JsonProperty(value = "PlayFabId")
     private String playFabId;
 
+    @JsonIgnore
+    @Setter
+    private String originalString = null;
+
     public DeviceOs getDeviceOs() {
         return deviceOs != null ? deviceOs : DeviceOs.UNKNOWN;
     }
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java
index c35261e78..199d29e30 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaGameProfileTranslator.java
@@ -57,7 +57,13 @@ public class JavaGameProfileTranslator extends PacketTranslator<ClientboundGameP
         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.
-            session.getAuthData().upload(session.getGeyser());
+            // We upload it after we know for sure that the target server
+            // is ready to handle the result of the global server.
+            session.getGeyser().getSkinUploader().uploadSkin(session.getCertChainData(), session.getClientData().getOriginalString());
         }
+
+        // We no longer need these variables; they're just taking up space in memory now
+        session.setCertChainData(null);
+        session.getClientData().setOriginalString(null);
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java b/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
index 2ed754963..2f64e8ffa 100644
--- a/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
@@ -155,10 +155,11 @@ public class LoginEncryptionUtils {
             session.setAuthenticationData(new AuthData(
                     extraData.get("displayName").asText(),
                     UUID.fromString(extraData.get("identity").asText()),
-                    extraData.get("XUID").asText(),
-                    certChainData, clientData
+                    extraData.get("XUID").asText()
             ));
 
+            session.setCertChainData(certChainData);
+
             if (payload.get("identityPublicKey").getNodeType() != JsonNodeType.STRING) {
                 throw new RuntimeException("Identity Public Key was not found!");
             }
@@ -169,6 +170,7 @@ public class LoginEncryptionUtils {
 
             JsonNode clientDataJson = JSON_MAPPER.readTree(clientJwt.getPayload().toBytes());
             BedrockClientData data = JSON_MAPPER.convertValue(clientDataJson, BedrockClientData.class);
+            data.setOriginalString(clientData);
             session.setClientData(data);
 
             if (EncryptionUtils.canUseEncryption()) {