diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index c9d5ca35b0..a5e3be8a43 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -941,7 +941,13 @@ void ScriptEngine::stopAllTimersForEntityScript(const EntityItemID& entityID) {
 
 }
 
-void ScriptEngine::stop() {
+void ScriptEngine::stop(bool marshal) {
+    _isStopping = true; // this can be done on any thread
+
+    if (marshal) {
+        QMetaObject::invokeMethod(this, "stop");
+        return;
+    }
     if (!_isFinished) {
         _isFinished = true;
         emit runningStateChanged();
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 80978e4527..1077dce686 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -84,7 +84,7 @@ public:
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - this is intended to be a public interface for Agent scripts, and local scripts, but not for EntityScripts
-    Q_INVOKABLE void stop();
+    Q_INVOKABLE void stop(bool marshal = false);
 
     // Stop any evaluating scripts and wait for the scripting thread to finish.
     void waitTillDoneRunning();
@@ -147,6 +147,9 @@ public:
     bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget
     bool isRunning() const { return _isRunning; } // used by ScriptWidget
 
+    // this is used by code in ScriptEngines.cpp during the "reload all" operation
+    bool isStopping() const { return _isStopping; }
+
     bool isDebuggable() const { return _debuggable; }
 
     void disconnectNonEssentialSignals();
@@ -189,6 +192,7 @@ protected:
     QString _parentURL;
     std::atomic<bool> _isFinished { false };
     std::atomic<bool> _isRunning { false };
+    std::atomic<bool> _isStopping { false };
     int _evaluatesPending { 0 };
     bool _isInitialized { false };
     QHash<QTimer*, CallbackData> _timerFunctionMap;
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 4fd680025a..29c223f4b3 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -380,7 +380,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
     // Stop and possibly restart all currently running scripts
     for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
         it != _scriptEnginesHash.constEnd(); it++) {
-        if (it.value()->isFinished()) {
+        if (it.value()->isFinished() || it.value()->isStopping()) {
             continue;
         }
         if (restart && it.value()->isUserLoaded()) {
@@ -388,8 +388,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
                 reloadScript(scriptName);
             });
         }
-        QMetaObject::invokeMethod(it.value(), "stop");
-        //it.value()->stop();
+        it.value()->stop(true);
         qCDebug(scriptengine) << "stopping script..." << it.key();
     }
 }
@@ -460,7 +459,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
     }
 
     auto scriptEngine = getScriptEngine(scriptUrl);
-    if (scriptEngine) {
+    if (scriptEngine && !scriptEngine->isStopping()) {
         return scriptEngine;
     }