diff --git a/patches/server/Paper-command.patch b/patches/server/Paper-command.patch
index 2e8b00fdb6..d775737ff4 100644
--- a/patches/server/Paper-command.patch
+++ b/patches/server/Paper-command.patch
@@ -344,6 +344,14 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/ja
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
+         this.commandMap.clearCommands();
+         this.reloadData();
+         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
++        io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
+         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
+ 
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
      // Spigot end
  
diff --git a/patches/server/Paper-config-files.patch b/patches/server/Paper-config-files.patch
index aa004adaba..9a59973399 100644
--- a/patches/server/Paper-config-files.patch
+++ b/patches/server/Paper-config-files.patch
@@ -4063,14 +4063,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          for (ServerLevel world : this.console.getAllLevels()) {
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         this.commandMap.clearCommands();
-         this.reloadData();
-         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-+        io.papermc.paper.configuration.PaperConfigurations.registerCommands(this.console);
-         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
-         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/patches/server/Remove-Metadata-on-reload.patch b/patches/server/Remove-Metadata-on-reload.patch
index 9a98689e54..5d1b8a6985 100644
--- a/patches/server/Remove-Metadata-on-reload.patch
+++ b/patches/server/Remove-Metadata-on-reload.patch
@@ -26,4 +26,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this.console);
+         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper