diff --git a/libraries/shared/src/SettingManager.cpp b/libraries/shared/src/SettingManager.cpp
index 296cbcab0a..823ebe7a18 100644
--- a/libraries/shared/src/SettingManager.cpp
+++ b/libraries/shared/src/SettingManager.cpp
@@ -45,26 +45,46 @@ namespace Setting {
     }
 
     void WriteWorker::sync() {
-        //qDebug() << "Forcing settings sync";
+        //qCDebug(settings_writer) << "Forcing settings sync";
         init();
         _qSettings->sync();
     }
 
+    void WriteWorker::threadFinished() {
+        qCDebug(settings_writer) << "Settings write worker syncing and terminating";
+        sync();
+        this->deleteLater();
+    }
+
+    void WriteWorker::terminate() {
+        qCDebug(settings_writer) << "Settings write worker being asked to terminate. Syncing and terminating.";
+        sync();
+        this->deleteLater();
+        QThread::currentThread()->exit(0);
+    }
+
     Manager::Manager(QObject *parent) {
         WriteWorker *worker = new WriteWorker();
 
         // We operate purely from memory, and forward all changes to a thread that has writing the
         // settings as its only job.
 
-        qDebug() << "Initializing settings write thread";
+        qCDebug(settings_manager) << "Initializing settings write thread";
 
         _workerThread.setObjectName("Settings Writer");
         worker->moveToThread(&_workerThread);
-        connect(&_workerThread, &QThread::started, worker, &WriteWorker::start, Qt::QueuedConnection);
-        connect(&_workerThread, &QThread::finished, worker, &QObject::deleteLater, Qt::QueuedConnection);
+        // connect(&_workerThread, &QThread::started, worker, &WriteWorker::start, Qt::QueuedConnection);
+
+        // All normal connections are queued, so that we're sure they happen asynchronously.
+        connect(&_workerThread, &QThread::finished, worker, &WriteWorker::threadFinished, Qt::QueuedConnection);
         connect(this, &Manager::valueChanged, worker, &WriteWorker::setValue, Qt::QueuedConnection);
         connect(this, &Manager::keyRemoved, worker, &WriteWorker::removeKey, Qt::QueuedConnection);
         connect(this, &Manager::syncRequested, worker, &WriteWorker::sync, Qt::QueuedConnection);
+
+        // This one is blocking because we want to wait until it's actually processed.
+        connect(this, &Manager::terminationRequested, worker, &WriteWorker::terminate, Qt::BlockingQueuedConnection);
+
+
         _workerThread.start();
 
         // Load all current settings
@@ -136,6 +156,16 @@ namespace Setting {
         emit syncRequested();
     }
 
+    void Manager::terminateThread() {
+        qCDebug(settings_manager) << "Terminating settings writer thread";
+
+        emit terminationRequested(); // This blocks
+
+        _workerThread.exit();
+        _workerThread.wait(THREAD_TERMINATION_TIMEOUT);
+        qCDebug(settings_manager) << "Settings writer terminated";
+    }
+
     QString Manager::fileName() const {
         return resultWithReadLock<QString>([&] {
             return _fileName;
diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h
index 726331eea4..4bc141a71d 100644
--- a/libraries/shared/src/SettingManager.h
+++ b/libraries/shared/src/SettingManager.h
@@ -80,6 +80,18 @@ namespace Setting {
          */
         void sync();
 
+        /**
+         * @brief Called when the thread is terminating
+         *
+         */
+        void threadFinished();
+
+        /**
+         * @brief Thread is being asked to finish work and quit
+         *
+         */
+        void terminate();
+
         private:
 
         void init() {
@@ -194,6 +206,7 @@ namespace Setting {
         void valueChanged(const QString key, QVariant value);
         void keyRemoved(const QString key);
         void syncRequested();
+        void terminationRequested();
 
     private:
         QHash<QString, Interface*> _handles;