diff --git a/common/src/main/java/com/viaversion/viaversion/connection/ProtocolInfoImpl.java b/common/src/main/java/com/viaversion/viaversion/connection/ProtocolInfoImpl.java
index e5ca9af26..a434bcbc7 100644
--- a/common/src/main/java/com/viaversion/viaversion/connection/ProtocolInfoImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/connection/ProtocolInfoImpl.java
@@ -23,7 +23,6 @@
 package com.viaversion.viaversion.connection;
 
 import com.viaversion.viaversion.api.connection.ProtocolInfo;
-import com.viaversion.viaversion.api.connection.StoredObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.packet.State;
@@ -31,7 +30,8 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.UUID;
 
-public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo {
+public class ProtocolInfoImpl implements ProtocolInfo {
+    private final UserConnection connection;
     private State state = State.HANDSHAKE;
     private int protocolVersion = -1;
     private int serverProtocolVersion = -1;
@@ -39,8 +39,8 @@ public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo {
     private UUID uuid;
     private ProtocolPipeline pipeline;
 
-    public ProtocolInfoImpl(UserConnection user) {
-        super(user);
+    public ProtocolInfoImpl(UserConnection connection) {
+        this.connection = connection;
     }
 
     @Override
@@ -106,6 +106,11 @@ public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo {
         this.pipeline = pipeline;
     }
 
+    @Override
+    public UserConnection getUser() {
+        return connection;
+    }
+
     @Override
     public String toString() {
         return "ProtocolInfo{" +
diff --git a/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java b/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
index 12f2292c0..6018d8473 100644
--- a/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
@@ -72,7 +72,6 @@ public class UserConnectionImpl implements UserConnection {
     public UserConnectionImpl(@Nullable Channel channel, boolean clientSide) {
         this.channel = channel;
         this.clientSide = clientSide;
-        storedObjects.put(ProtocolInfo.class, (StoredObject) protocolInfo);
     }
 
     /**