diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
index da3672b..35f0b0b 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
@@ -23,8 +23,8 @@ public class FMLMarkerAdder extends MessageToMessageEncoder<Handshake> {
     MinecraftConnection connection = (MinecraftConnection) ctx.pipeline().get(Connections.HANDLER);
     VelocityServerConnection serverConnection = (VelocityServerConnection) connection.getAssociation();
 
-    if (serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType) {
-      msg.setServerAddress(msg.getServerAddress() + ForgeConstants.FML2Marker);
+    if (serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType FMLType) {
+      msg.setServerAddress(msg.getServerAddress() + (FMLType == ForgeConstants.ForgeFML3 ? ForgeConstants.FML3Marker : ForgeConstants.FML2Marker));
     }
     out.add(msg);
     ctx.pipeline().remove(this);