diff --git a/libraries/shared/src/SettingManager.cpp b/libraries/shared/src/SettingManager.cpp
index abb8525b03..2ccee513da 100644
--- a/libraries/shared/src/SettingManager.cpp
+++ b/libraries/shared/src/SettingManager.cpp
@@ -70,11 +70,10 @@ namespace Setting {
         QVariant handleValue = UNSET_VALUE;
         if (handle->isSet()) {
             handleValue = handle->getVariant();
+            withWriteLock([&] {
+                _pendingChanges[key] = handleValue;
+            });
         }
-
-        withWriteLock([&] {
-            _pendingChanges[key] = handleValue;
-        });
     }
 
     static const int SAVE_INTERVAL_MSEC = 5 * 1000; // 5 sec
diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h
index 1f309c966f..ffdd4ba42a 100644
--- a/libraries/shared/src/SettingManager.h
+++ b/libraries/shared/src/SettingManager.h
@@ -46,7 +46,7 @@ namespace Setting {
     private:
         QHash<QString, Interface*> _handles;
         QPointer<QTimer> _saveTimer = nullptr;
-        const QVariant UNSET_VALUE { QUuid::createUuid().variant() };
+        const QVariant UNSET_VALUE { QUuid::createUuid() };
         QHash<QString, QVariant> _pendingChanges;
 
         friend class Interface;