diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftTag.java
index 682b06f93e..007db9fbd0 100644
--- a/src/main/java/org/bukkit/craftbukkit/tag/CraftTag.java
+++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftTag.java
@@ -20,6 +20,10 @@ public abstract class CraftTag<N, B extends Keyed> implements Tag<B> {
     }
 
     protected net.minecraft.server.Tag<N> getHandle() {
+        if (handle == null) {
+            handle = registry.b(tag);
+        }
+
         return handle;
     }