diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/ConnectionType.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/ConnectionType.java
index 81cb4e504..a69768946 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/ConnectionType.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/ConnectionType.java
@@ -42,6 +42,6 @@ public interface ConnectionType {
    * @return true if valid.
    */
   default boolean checkServerAddressIsValid(String address) {
-    return !address.contains("\0");
+    return true;
   }
 }
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/forge/legacy/LegacyForgeConnectionType.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/forge/legacy/LegacyForgeConnectionType.java
index 0b0ded3d3..544680bc4 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/forge/legacy/LegacyForgeConnectionType.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/forge/legacy/LegacyForgeConnectionType.java
@@ -31,10 +31,4 @@ public class LegacyForgeConnectionType extends ConnectionTypeImpl {
 
     return original;
   }
-
-  @Override
-  public boolean checkServerAddressIsValid(String address) {
-    return super.checkServerAddressIsValid(
-        address.replaceAll(LegacyForgeConstants.HANDSHAKE_HOSTNAME_TOKEN, ""));
-  }
 }