diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index be87d2c993..972a385b49 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -81,6 +81,7 @@ void EntityTreeRenderer::clear() {
     }
     OctreeRenderer::clear();
     _entityScripts.clear();
+    _entitiesScriptEngine->disconnect();
 }
 
 void EntityTreeRenderer::init() {
@@ -969,10 +970,6 @@ void EntityTreeRenderer::checkAndCallUnload(const EntityItemID& entityID) {
             QScriptValueList entityArgs = createEntityArgs(entityID);
             entityScript.property("unload").call(entityScript, entityArgs);
         }
-        
-        // In the event that the entity script connected to any of our signals
-        // we want to disconnect it so we don't have anything dangling
-        _entitiesScriptEngine->disconnect(entityScript.toQObject());
     }
 }