diff --git a/patches/minecraft/net/minecraft/network/play/server/SCommandListPacket.java.patch b/patches/minecraft/net/minecraft/network/play/server/SCommandListPacket.java.patch
new file mode 100644
index 000000000..34a406a83
--- /dev/null
+++ b/patches/minecraft/net/minecraft/network/play/server/SCommandListPacket.java.patch
@@ -0,0 +1,12 @@
+--- a/net/minecraft/network/play/server/SCommandListPacket.java
++++ b/net/minecraft/network/play/server/SCommandListPacket.java
+@@ -110,6 +110,9 @@
+          String s = p_197695_1_.func_150789_c(32767);
+          ArgumentType<?> argumenttype = ArgumentTypes.func_197486_a(p_197695_1_);
+          if (argumenttype == null) {
++            if ((p_197695_2_ & 16) != 0) { // FORGE: Flush unused suggestion data
++               p_197695_1_.func_192575_l();
++            }
+             return null;
+          } else {
+             RequiredArgumentBuilder<ISuggestionProvider, ?> requiredargumentbuilder = RequiredArgumentBuilder.argument(s, argumenttype);