diff --git a/Spigot-Server-Patches/0304-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0304-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index def9fe6a24..cd1039d1fc 100644
--- a/Spigot-Server-Patches/0304-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0304-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -378,7 +378,7 @@ index 6a6b80b5bd..dbb4e5258c 100644
 +    }
 +
 +    private @Nullable Namespaced deserializeNamespaced(String raw) {
-+        boolean isTag = raw.codePointAt(0) == '#';
++        boolean isTag = raw.length() > 0 && raw.codePointAt(0) == '#';
 +        net.minecraft.server.ArgumentBlock blockParser = new net.minecraft.server.ArgumentBlock(new com.mojang.brigadier.StringReader(raw), true);
 +        try {
 +            blockParser = blockParser.parse(false);