diff --git a/src/main/java/somehussar/janino/EntityUnloadListener.java b/src/main/java/somehussar/janino/EntityUnloadListener.java
index afcbec5b8..8e7d917bb 100644
--- a/src/main/java/somehussar/janino/EntityUnloadListener.java
+++ b/src/main/java/somehussar/janino/EntityUnloadListener.java
@@ -47,6 +47,7 @@ public class EntityUnloadListener implements IWorldAccess {
             EntityNPCInterface npc = (EntityNPCInterface) entity;
             if (npc.janinoHandler != null)
                 npc.janinoHandler.prepareToUnload();
+            npc.janinoHandler = null;
         }
      }