diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 99c02ba1f6..fe77e36f0c 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -219,6 +219,19 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
         }
         logException(output);
     });
+
+    if (_type == Type::ENTITY_CLIENT || _type == Type::ENTITY_SERVER) {
+        QObject::connect(this, &ScriptEngine::update, this, [this]() {
+            // process pending entity script content
+            if (_contentAvailableQueue.size()) {
+                auto pending = _contentAvailableQueue.values().toStdList();
+                _contentAvailableQueue.clear();
+                for (auto& args : pending) {
+                    entityScriptContentAvailable(args.entityID, args.scriptOrURL, args.contents, args.isURL, args.success, args.status);
+                }
+            }
+        });
+    }
 }
 
 QString ScriptEngine::getContext() const {
@@ -2181,7 +2194,7 @@ void ScriptEngine::loadEntityScript(const EntityItemID& entityID, const QString&
                 qCDebug(scriptengine) << "loadEntityScript.contentAvailable" << status << QUrl(url).fileName() << entityID.toString();
 #endif
                 if (!isStopping() && _entityScripts.contains(entityID)) {
-                    entityScriptContentAvailable(entityID, url, contents, isURL, success, status);
+                    _contentAvailableQueue[entityID] = { entityID, url, contents, isURL, success, status };
                 } else {
 #ifdef DEBUG_ENTITY_STATES
                     qCDebug(scriptengine) << "loadEntityScript.contentAvailable -- aborting";
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index c02a63ef3c..3280c2f249 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -71,6 +71,15 @@ public:
     //bool forceRedownload;
 };
 
+struct EntityScriptContentAvailable {
+    EntityItemID entityID;
+    QString scriptOrURL;
+    QString contents;
+    bool isURL;
+    bool success;
+    QString status;
+};
+
 typedef QList<CallbackData> CallbackList;
 typedef QHash<QString, CallbackList> RegisteredEventHandlers;
 
@@ -762,6 +771,7 @@ protected:
     QHash<EntityItemID, EntityScriptDetails> _entityScripts;
     QHash<QString, EntityItemID> _occupiedScriptURLs;
     QList<DeferredLoadEntity> _deferredEntityLoads;
+    QMap<EntityItemID, EntityScriptContentAvailable> _contentAvailableQueue;
 
     bool _isThreaded { false };
     QScriptEngineDebugger* _debugger { nullptr };