diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 36fb666f69..cce4b14868 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5252,7 +5252,8 @@ void Application::resumeAfterLoginDialogActionTaken() {
         // this will force the model the look at the correct directory (weird order of operations issue)
         scriptEngines->reloadLocalFiles();
 
-        if (!_defaultScriptsLocation.exists()) {
+        // if the --scripts command-line argument was used.
+        if (!_defaultScriptsLocation.exists() && (arguments().indexOf(QString("--").append(SCRIPTS_SWITCH))) != -1) {
             scriptEngines->loadDefaultScripts();
             scriptEngines->defaultScriptsLocationOverridden(true);
         } else {