diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69377e5d84..8660238d16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # QOwnNotes Changelog
 
+## 24.1.1
+- a crash on certain systems at startup after the script update check was fixed
+  (for [#2937](https://github.com/pbek/QOwnNotes/issues/2937))
+
 ## 24.1.0
 - the script update check at startup now runs in a separate thread to not block
   the application startup (for [#2934](https://github.com/pbek/QOwnNotes/issues/2934))
diff --git a/src/dialogs/scriptrepositorydialog.cpp b/src/dialogs/scriptrepositorydialog.cpp
index aa5b6ddea9..c2b937a7df 100644
--- a/src/dialogs/scriptrepositorydialog.cpp
+++ b/src/dialogs/scriptrepositorydialog.cpp
@@ -74,6 +74,7 @@ bool ScriptRepositoryDialog::loadScriptRepositoryMetaData() {
         QUrl("https://github.com/qownnotes/scripts/releases/download/metadata-index/index.json");
 
     int statusCode;
+    // This should have a 10-second timeout
     auto arr = Utils::Misc::downloadUrlWithStatusCode(url, statusCode);
 
     if (statusCode != 200) {
@@ -158,8 +159,11 @@ void ScriptRepositoryDialog::searchForUpdatesForScripts(const QList<Script>& scr
             continue;
         }
 
+        if (!scriptUpdateFound) {
+            emit updateFound();
+        }
+
         scriptUpdateFound = true;
-        emit updateFound();
         addScriptTreeWidgetItem(scriptInfoJson);
         ui->selectFrame->show();
     }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index db9797e1bf..9a986f0bd0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -10951,17 +10951,26 @@ void MainWindow::on_actionCheck_for_script_updates_triggered() {
  */
 void MainWindow::automaticScriptUpdateCheck() {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    // Sqlite isn't available in a separate thread, so we need to fetch the scripts before that
+    auto scripts = Script::fetchAll();
+
+    // We don't need to check for updates if there are no scripts
+    if (scripts.isEmpty()) {
+        return;
+    }
+
     _scriptUpdateFound = false;
     auto *dialog = new ScriptRepositoryDialog(this, true);
 
     // Show a message once if no script update were found
     // We need to do that in a slot, because you can't use a timer in a separate thread
-    QObject::connect(dialog, &ScriptRepositoryDialog::noUpdateFound, this, [this]() {
+    QObject::connect(dialog, &ScriptRepositoryDialog::noUpdateFound, this, [this, dialog]() {
         showStatusBarMessage(tr("No script updates were found"), 3000);
+        delete(dialog);
     });
 
     // Show a dialog once if a script update was found
-    QObject::connect(dialog, &ScriptRepositoryDialog::updateFound, this, [this]() {
+    QObject::connect(dialog, &ScriptRepositoryDialog::updateFound, this, [this, dialog]() {
         // We only want to run this once
         if (_scriptUpdateFound) {
             return;
@@ -10969,31 +10978,24 @@ void MainWindow::automaticScriptUpdateCheck() {
 
         _scriptUpdateFound = true;
         showStatusBarMessage(tr("A script update was found!"), 4000);
+        delete(dialog);
 
-        // Open the update question dialog in another thread so the dialog
-        // can be deleted meanwhile
-        QTimer::singleShot(100, this, [this]() {
-            if (Utils::Gui::question(this, tr("Script updates"),
-                                     tr("Updates to your scripts were found in the script "
-                                        "repository! Do you want to update them?"),
-                                     "auto-script-update") == QMessageBox::Yes) {
-                on_actionCheck_for_script_updates_triggered();
-            }
-        });
+        if (Utils::Gui::question(this, tr("Script updates"),
+                                 tr("Updates to your scripts were found in the script "
+                                    "repository! Do you want to update them?"),
+                                 "auto-script-update") == QMessageBox::Yes) {
+            on_actionCheck_for_script_updates_triggered();
+        }
     });
 
-    // Sqlite isn't available in a separate thread, so we need to fetch the scripts before that
-    auto scripts = Script::fetchAll();
-
     // Search for script updates in the background after the "updateFound" signal was connected
+    // We must not do a `delete (dialog)` in the new thread, that was causing a crash on some systems
+    // See https://github.com/pbek/QOwnNotes/issues/2937
     QFuture<void> future = QtConcurrent::run([this, dialog, scripts]() {
         qDebug() << "start searchForUpdates";
         dialog->searchForUpdatesForScripts(scripts);
         qDebug() << "done searchForUpdates";
 
-        // Delete the dialog afterward
-        delete (dialog);
-
         if (_scriptUpdateFound) {
             _scriptUpdateFound = false;
         }
@@ -11061,6 +11063,7 @@ void MainWindow::on_noteTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int
     Q_UNUSED(item)
     Q_UNUSED(column)
 
+    // call a script hook that a new note was double-clicked
     const bool hookFound =
         ScriptingService::instance()->callHandleNoteDoubleClickedHook(&currentNote);