diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index caf9a26582..1245ce5fcb 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -303,6 +303,8 @@ void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
         }
 
         resetEntitiesScriptEngine();
+
+        _entityViewer.clear();
     }
 }