diff --git a/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java b/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
index 04191e62..bdf7327e 100644
--- a/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
@@ -20,7 +20,7 @@ public class ServerEntityManager_scarpetMixin
     private void handleAddedEntity(EntityLike entityLike, boolean existing, CallbackInfoReturnable<Boolean> cir)
     {
         Entity entity = (Entity)entityLike;
-        CarpetEventServer.Event event = CarpetEventServer.Event.ENTITY_LOAD.get(entity.getType());
+        CarpetEventServer.Event event = CarpetEventServer.Event.ENTITY_HANDLER.get(entity.getType());
         if (event != null)
         {
             if (event.isNeeded())
@@ -33,6 +33,19 @@ public class ServerEntityManager_scarpetMixin
             CarpetScriptServer.LOG.error("Failed to handle entity type " + entity.getType().getTranslationKey());
         }
 
+        event = CarpetEventServer.Event.ENTITY_LOAD.get(entity.getType());
+        if (event != null)
+        {
+            if (event.isNeeded())
+            {
+                event.onEntityAction(entity, true);
+            }
+        }
+        else
+        {
+            CarpetScriptServer.LOG.error("Failed to handle entity type " + entity.getType().getTranslationKey());
+        }
+
     }
 
 }
diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java
index 7b066d37..a0949876 100644
--- a/src/main/java/carpet/script/CarpetEventServer.java
+++ b/src/main/java/carpet/script/CarpetEventServer.java
@@ -935,7 +935,8 @@ public class CarpetEventServer
         }
 
         @Deprecated
-        public static final Map<EntityType<? extends Entity>, Event> ENTITY_LOAD= new HashMap<EntityType<? extends Entity>, Event>() {{
+        public static final Map<EntityType<? extends Entity>, Event> ENTITY_LOAD= new HashMap<>()
+        {{
             EntityType.get("zombie");
             Registry.ENTITY_TYPE.forEach(et -> {
                 put(et, new Event(getEntityLoadEventName(et), 1, true, false)
@@ -957,7 +958,8 @@ public class CarpetEventServer
             return "entity_handler_" + ValueConversions.of(Registry.ENTITY_TYPE.getId(et)).getString();
         }
 
-        public static final Map<EntityType<? extends Entity>, Event> ENTITY_HANDLER= new HashMap<EntityType<? extends Entity>, Event>() {{
+        public static final Map<EntityType<? extends Entity>, Event> ENTITY_HANDLER= new HashMap<>()
+        {{
             EntityType.get("zombie");
             Registry.ENTITY_TYPE.forEach(et -> {
                 put(et, new Event(getEntityHandlerEventName(et), 2, true, false)