diff --git a/patches/api/Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 4c8daeb08c..bd41039979 100644
--- a/patches/api/Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
@@ -38,3 +38,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          String[] components = string.split(":", 3);
          if (components.length > 2) {
+diff --git a/src/test/java/org/bukkit/NamespacedKeyTest.java b/src/test/java/org/bukkit/NamespacedKeyTest.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/test/java/org/bukkit/NamespacedKeyTest.java
++++ b/src/test/java/org/bukkit/NamespacedKeyTest.java
+@@ -0,0 +0,0 @@ public class NamespacedKeyTest {
+         assertNull(NamespacedKey.fromString("foo:bar:bazz"));
+     }
+ 
++    @org.junit.jupiter.api.Disabled // Paper - Fixup NamespacedKey handling
+     @Test
+     public void testFromStringEmptyInput() {
+         assertThrows(IllegalArgumentException.class, () -> NamespacedKey.fromString(""));
+@@ -0,0 +0,0 @@ public class NamespacedKeyTest {
+                 "loremipsumdolorsitametconsecteturadipiscingelitduisvolutpatvelitsitametmaximusscelerisquemorbiullamcorperexacconsequategestas").toString();
+     }
+ 
++    @org.junit.jupiter.api.Disabled // Paper - Fixup NamespacedKey handling
+     @Test
+     public void testAboveLength() {
+         assertThrows(IllegalArgumentException.class, () -> new NamespacedKey("loremipsumdolorsitametconsecteturadipiscingelitduisvolutpatvelitsitametmaximusscelerisquemorbiullamcorperexacconsequategestas",