diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
index df15a8b1a4..f3ac62de83 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -901,6 +901,12 @@ public boolean isSpawnedOrValidForTag() {
         if (isFake) {
             return true;
         }
+        if (entity == null) { // Note: this breaks thread-patch for entities that need revalidating
+            if (uuid == null) {
+                return false;
+            }
+            return isValid() || rememberedEntities.containsKey(uuid);
+        }
         NMSHandler.getChunkHelper().changeChunkServerThread(entity.getWorld());
         try {
             return isValid() || rememberedEntities.containsKey(entity.getUniqueId());