diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp
index e2051873d..105d77d14 100644
--- a/src/lib/common/Settings.cpp
+++ b/src/lib/common/Settings.cpp
@@ -109,14 +109,11 @@ int Settings::logLevelToInt(const QString &level)
 
 QVariant Settings::defaultValue(const QString &key)
 {
-  if ((key == Gui::Autohide) || (key == Core::StartedBefore) || (key == Core::PreventSleep) ||
-      (key == Server::ExternalConfig) || (key == Client::InvertScrollDirection) || (key == Log::ToFile)) {
+  if (m_defaultFalseValues.contains(key)) {
     return false;
   }
 
-  if ((key == Core::UseHooks) || (key == Gui::CloseToTray) || (key == Gui::LogExpanded) ||
-      (key == Gui::SymbolicTrayIcon) || (key == Gui::CloseReminder) || (key == Security::TlsEnabled) ||
-      (key == Security::CheckPeers) || (key == Client::LanguageSync) || (key == Gui::ShowGenericClientFailureDialog)) {
+  if (m_defaultTrueValues.contains(key)) {
     return true;
   }
 
diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h
index 1067a0bfb..fb3b66464 100644
--- a/src/lib/common/Settings.h
+++ b/src/lib/common/Settings.h
@@ -200,5 +200,28 @@ private:
     , Settings::Server::ExternalConfig
     , Settings::Server::ExternalConfigFile
   };
+
+  // When checking the default values this list contains the ones that default to false.
+  inline static const QStringList m_defaultFalseValues = {
+      Settings::Gui::Autohide
+    , Settings::Core::StartedBefore
+    , Settings::Core::PreventSleep
+    , Settings::Server::ExternalConfig
+    , Settings::Client::InvertScrollDirection
+    , Settings::Log::ToFile
+  };
+
+  // When checking the default values this list contains the ones that default to true.
+  inline static const QStringList m_defaultTrueValues = {
+      Settings::Core::UseHooks
+    , Settings::Client::LanguageSync
+    , Settings::Gui::CloseToTray
+    , Settings::Gui::CloseReminder
+    , Settings::Gui::LogExpanded
+    , Settings::Gui::SymbolicTrayIcon
+    , Settings::Gui::ShowGenericClientFailureDialog
+    , Settings::Security::TlsEnabled
+    , Settings::Security::CheckPeers
+  };
   // clang-format on
 };