diff --git a/paper-server/nms-patches/CommandBlockListenerAbstract.patch b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
index 84668fcc33..39842e8109 100644
--- a/paper-server/nms-patches/CommandBlockListenerAbstract.patch
+++ b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
@@ -35,3 +35,15 @@
                      } catch (Throwable throwable) {
                          CrashReport crashreport = CrashReport.a(throwable, "Executing command block");
                          CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed");
+@@ -141,6 +139,11 @@
+     }
+ 
+     public void setName(IChatBaseComponent ichatbasecomponent) {
++        // CraftBukkit start
++        if (ichatbasecomponent == null) {
++            ichatbasecomponent = new ChatComponentText("@");
++        }
++        // CraftBukkit end
+         this.h = ichatbasecomponent;
+     }
+