diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
index 03d2392a89..f1f41262db 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
@@ -9,6 +9,9 @@ public final class CraftNamespacedKey {
     }
 
     public static NamespacedKey fromStringOrNull(String string) {
+        if (string == null || string.isEmpty()) {
+            return null;
+        }
         MinecraftKey minecraft = MinecraftKey.a(string);
         return (minecraft == null) ? null : fromMinecraft(minecraft);
     }