diff --git a/paper-server/nms-patches/MinecraftServer.patch b/paper-server/nms-patches/MinecraftServer.patch
index 551c2ca4db1..fee1d6563ec 100644
--- a/paper-server/nms-patches/MinecraftServer.patch
+++ b/paper-server/nms-patches/MinecraftServer.patch
@@ -643,7 +643,7 @@
      }
  
      public CrashReport b(CrashReport crashreport) {
-@@ -1217,11 +1472,11 @@
+@@ -1217,16 +1472,17 @@
  
      public CompletableFuture<Void> a(Collection<String> collection) {
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
@@ -657,7 +657,13 @@
          }, this).thenCompose((immutablelist) -> {
              return DataPackResources.a(immutablelist, this.j() ? CommandDispatcher.ServerType.DEDICATED : CommandDispatcher.ServerType.INTEGRATED, this.h(), this.executorService, this);
          }).thenAcceptAsync((datapackresources) -> {
-@@ -1592,6 +1847,22 @@
+             this.dataPackResources.close();
+             this.dataPackResources = datapackresources;
++            this.server.syncCommands(); // SPIGOT-5884: Lost on reload
+             this.resourcePackRepository.a(collection);
+             this.saveData.a(a(this.resourcePackRepository));
+             datapackresources.i();
+@@ -1592,6 +1848,22 @@
  
      }
  
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d01f3d600ac..aa2dd956947 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -429,7 +429,7 @@ public final class CraftServer implements Server {
         }
     }
 
-    private void syncCommands() {
+    public void syncCommands() {
         // Clear existing commands
         CommandDispatcher dispatcher = console.dataPackResources.commandDispatcher = new CommandDispatcher();