diff --git a/VelocityCore/src/de/steamwar/command/TypeUtils.java b/VelocityCore/src/de/steamwar/command/TypeUtils.java
index a273cda2..db22ec99 100644
--- a/VelocityCore/src/de/steamwar/command/TypeUtils.java
+++ b/VelocityCore/src/de/steamwar/command/TypeUtils.java
@@ -46,7 +46,9 @@ public class TypeUtils {
                 Player player = sender.getPlayer();
                 if (player != null && s.isEmpty()) {
                     ProtocolVersion version = player.getProtocolVersion();
-                    if (version.greaterThan(ProtocolVersion.MINECRAFT_1_19_4)) {
+                    if (version.greaterThan(ProtocolVersion.MINECRAFT_1_20_5)) {
+                        return ServerVersion.PAPER_21;
+                    } else if (version.greaterThan(ProtocolVersion.MINECRAFT_1_19_4)) {
                         return ServerVersion.PAPER_20;
                     } else if (version.greaterThan(ProtocolVersion.MINECRAFT_1_15_2)) {
                         return ServerVersion.PAPER_19;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index 058771e7..db199b97 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -61,7 +61,7 @@ public class ServerStarter {
     private String worldDir = null;
 
     private Node node = null;
-    private ServerVersion version = ServerVersion.PAPER_20;
+    private ServerVersion version = ServerVersion.PAPER_21;
     private Portrange portrange = BAU_PORTS;
     private Function<Integer, String> serverNameProvider = port -> node.getName() + port;
     private BooleanSupplier startCondition = () -> true;