diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index 1245ce5fcb..ca48016feb 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -296,7 +296,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
 }
 
 void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
-    if (killedNode->getType() == NodeType::EntityServer) {
+    if (!_shuttingDown && killedNode->getType() == NodeType::EntityServer) {
         if (_entitiesScriptEngine) {
             _entitiesScriptEngine->unloadAllEntityScripts();
             _entitiesScriptEngine->stop();