diff --git a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaConnectionManager.java b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaConnectionManager.java
index d26eabff1..f5ac95aed 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaConnectionManager.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaConnectionManager.java
@@ -46,7 +46,7 @@ public class ViaConnectionManager {
      * UUIDs can't be duplicate between frontend connections.
      */
     public boolean isFrontEnd(UserConnection conn) {
-        return true;
+        return !conn.isClientSide();
     }
 
     /**
diff --git a/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java b/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java
index 2321aeb00..a5114b4dc 100644
--- a/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java
+++ b/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java
@@ -69,7 +69,7 @@ public class VelocityPlugin implements ViaPlatform<Player> {
         api = new VelocityViaAPI();
         conf = new VelocityViaConfig(configDir.toFile());
         logger = new LoggerWrapper(loggerslf4j);
-        connectionManager = new VelocityConnectionManager();
+        connectionManager = new ViaConnectionManager();
         Via.init(ViaManager.builder()
                 .platform(this)
                 .commandHandler(commandHandler)
diff --git a/velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityConnectionManager.java b/velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityConnectionManager.java
deleted file mode 100644
index c8735ce09..000000000
--- a/velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityConnectionManager.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package us.myles.ViaVersion.velocity.platform;
-
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.api.platform.ViaConnectionManager;
-
-public class VelocityConnectionManager extends ViaConnectionManager {
-    @Override
-    public boolean isFrontEnd(UserConnection conn) {
-        return !conn.isClientSide();
-    }
-}