diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index b5ed4b767d..3538f07d32 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -167,6 +167,13 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     entityScriptingInterface->setEntitiesScriptEngine(entitiesScriptEngineProvider);
 
+    connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) {
+        EntityItemPointer entity = getTree()->findEntityByID(entityID);
+        if (entity) {
+            entity->setScriptHasFinishedPreload(true);
+        }
+    });
+
     // Connect mouse events to entity script callbacks
     if (!_mouseAndPreloadSignalHandlersConnected) {
     
@@ -205,13 +212,6 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
             _entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverLeaveEntity", event);
         });
 
-        connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) {
-            EntityItemPointer entity = getTree()->findEntityByID(entityID);
-            if (entity) {
-                entity->setScriptHasFinishedPreload(true);
-            }
-        });
-
         _mouseAndPreloadSignalHandlersConnected = true;
     }
 }