diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch
index f23909ee56..ca7ab2a411 100644
--- a/nms-patches/CommandBlockListenerAbstract.patch
+++ b/nms-patches/CommandBlockListenerAbstract.patch
@@ -28,7 +28,7 @@
                      this.d = null;
 -                    this.b = icommandhandler.a(this, this.e);
 +                    // CraftBukkit start - Handle command block commands using Bukkit dispatcher
-+                    this.b = executeCommand(this, sender, this.e);
++                    this.b = executeSafely(this, sender, this.e);
 +                    // CraftBukkit end
                  } catch (Throwable throwable) {
                      CrashReport crashreport = CrashReport.a(throwable, "Executing command block");