diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 93f210cf03..f22cb11f37 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -71,7 +71,6 @@ void LoginDialog::showWithSelection() {
             tablet->initialScreen(TABLET_LOGIN_DIALOG_URL);
         } else {
             // let Application handle creating login dialog overlay.
-            qApp->checkReadyToCreateLoginDialogOverlay();
         }
     }
 
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 6393ff33ea..50bb1ed5d9 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -320,6 +320,11 @@ void ScriptEngines::loadScripts() {
 
     // loads all saved scripts
     auto runningScripts = runningScriptsHandle.get();
+    if (runningScripts.empty()) {
+        loadDefaultScripts();
+        return;
+    }
+
     for (auto script : runningScripts) {
         auto string = script.toString();
         if (!string.isEmpty()) {