diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index fba375aeef..f06d1a5b6f 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -253,7 +253,10 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
 }
 
 void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
-
+    if (killedNode->getType() == NodeType::EntityServer) {
+        _entitiesScriptEngine->unloadAllEntityScripts();
+        resetEntitiesScriptEngine();
+    }
 }
 
 void EntityScriptServer::sendStatsPacket() {