diff --git a/Spigot-Server-Patches/Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/Empty-commands-shall-not-be-dispatched.patch
new file mode 100644
index 0000000000..32ffcabf59
--- /dev/null
+++ b/Spigot-Server-Patches/Empty-commands-shall-not-be-dispatched.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <proximyst@proximyst.com>
+Date: Wed, 6 Jan 2021 23:38:43 +0100
+Subject: [PATCH] Empty commands shall not be dispatched
+
+
+diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
++++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
+@@ -0,0 +0,0 @@ public class CommandDispatcher {
+         command = event.getCommand();
+ 
+         String[] args = command.split(" ");
++        if (args.length == 0) return 0; // Paper - empty commands shall not be dispatched
+ 
+         String cmd = args[0];
+         if (cmd.startsWith("minecraft:")) cmd = cmd.substring("minecraft:".length());