diff --git a/src/settings/appearancesettingspage.cpp b/src/settings/appearancesettingspage.cpp
index a01fb1adf..a8164086a 100644
--- a/src/settings/appearancesettingspage.cpp
+++ b/src/settings/appearancesettingspage.cpp
@@ -138,8 +138,6 @@ AppearanceSettingsPage::~AppearanceSettingsPage() {
 void AppearanceSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
 
   QPalette p = QApplication::palette();
@@ -217,6 +215,8 @@ void AppearanceSettingsPage::Load() {
 
   Init(ui_->layout_appearancesettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void AppearanceSettingsPage::Save() {
diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp
index dddecb214..1ce2ffbe2 100644
--- a/src/settings/backendsettingspage.cpp
+++ b/src/settings/backendsettingspage.cpp
@@ -86,8 +86,6 @@ void BackendSettingsPage::Load() {
   engineloaded_ = false;
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
 
   Engine::EngineType enginetype = Engine::EngineTypeFromName(s.value("engine", EngineName(Engine::None)).toString());
@@ -185,6 +183,7 @@ void BackendSettingsPage::Load() {
   RgPreampChanged(ui_->stickslider_replaygainpreamp->value());
 
   Init(ui_->layout_backendsettingspage->parentWidget());
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
 
   // Check if engine, output or device is set to a different setting than the configured to force saving settings.
 
diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp
index 35fef0970..869a8356c 100644
--- a/src/settings/behavioursettingspage.cpp
+++ b/src/settings/behavioursettingspage.cpp
@@ -149,7 +149,6 @@ BehaviourSettingsPage::~BehaviourSettingsPage() {
 void BehaviourSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
   s.beginGroup(kSettingsGroup);
 
 #ifndef Q_OS_MACOS
@@ -225,6 +224,8 @@ void BehaviourSettingsPage::Load() {
 
   Init(ui_->layout_behavioursettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void BehaviourSettingsPage::Save() {
diff --git a/src/settings/collectionsettingspage.cpp b/src/settings/collectionsettingspage.cpp
index 9970808d9..e6001e3f7 100644
--- a/src/settings/collectionsettingspage.cpp
+++ b/src/settings/collectionsettingspage.cpp
@@ -149,7 +149,6 @@ void CollectionSettingsPage::Load() {
   }
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
 
   s.beginGroup(kSettingsGroup);
   ui_->auto_open->setChecked(s.value("auto_open", true).toBool());
@@ -195,6 +194,7 @@ void CollectionSettingsPage::Load() {
   ui_->disk_cache_in_use->setText((dialog()->app()->collection_model()->icon_cache_disk_size() == 0 ? "empty" : Utilities::PrettySize(dialog()->app()->collection_model()->icon_cache_disk_size())));
 
   Init(ui_->layout_collectionsettingspage->parentWidget());
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
 
 }
 
diff --git a/src/settings/contextsettingspage.cpp b/src/settings/contextsettingspage.cpp
index b46b370ad..40f976b09 100644
--- a/src/settings/contextsettingspage.cpp
+++ b/src/settings/contextsettingspage.cpp
@@ -125,9 +125,8 @@ ContextSettingsPage::~ContextSettingsPage() { delete ui_; }
 void ContextSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
+
   ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, "%title% - %artist%").toString());
   ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, "%album%").toString());
 
@@ -157,6 +156,8 @@ void ContextSettingsPage::Load() {
 
   Init(ui_->layout_contextsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void ContextSettingsPage::Save() {
diff --git a/src/settings/coverssettingspage.cpp b/src/settings/coverssettingspage.cpp
index 0b86d6475..42979d5b1 100644
--- a/src/settings/coverssettingspage.cpp
+++ b/src/settings/coverssettingspage.cpp
@@ -73,8 +73,6 @@ CoversSettingsPage::~CoversSettingsPage() { delete ui_; }
 
 void CoversSettingsPage::Load() {
 
-  if (!QSettings().contains(kSettingsGroup)) set_changed();
-
   ui_->providers->clear();
 
   QList<CoverProvider*> cover_providers_sorted = dialog()->app()->cover_providers()->List();
@@ -89,6 +87,8 @@ void CoversSettingsPage::Load() {
 
   Init(ui_->layout_coverssettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void CoversSettingsPage::Save() {
diff --git a/src/settings/lyricssettingspage.cpp b/src/settings/lyricssettingspage.cpp
index 4a8016475..b2140e18a 100644
--- a/src/settings/lyricssettingspage.cpp
+++ b/src/settings/lyricssettingspage.cpp
@@ -73,8 +73,6 @@ LyricsSettingsPage::~LyricsSettingsPage() { delete ui_; }
 
 void LyricsSettingsPage::Load() {
 
-  if (!QSettings().contains(kSettingsGroup)) set_changed();
-
   ui_->providers->clear();
 
   QList<LyricsProvider*> lyrics_providers_sorted = dialog()->app()->lyrics_providers()->List();
@@ -89,6 +87,8 @@ void LyricsSettingsPage::Load() {
 
   Init(ui_->layout_lyricssettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void LyricsSettingsPage::Save() {
diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp
index 4d9af3191..f937009ad 100644
--- a/src/settings/moodbarsettingspage.cpp
+++ b/src/settings/moodbarsettingspage.cpp
@@ -66,8 +66,6 @@ MoodbarSettingsPage::~MoodbarSettingsPage() { delete ui_; }
 void MoodbarSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
   ui_->moodbar_enabled->setChecked(s.value("enabled", false).toBool());
   ui_->moodbar_show->setChecked(s.value("show", false).toBool());
@@ -79,6 +77,8 @@ void MoodbarSettingsPage::Load() {
 
   Init(ui_->layout_moodbarsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void MoodbarSettingsPage::Save() {
diff --git a/src/settings/networkproxysettingspage.cpp b/src/settings/networkproxysettingspage.cpp
index cb216fbd2..4c6c23a3d 100644
--- a/src/settings/networkproxysettingspage.cpp
+++ b/src/settings/networkproxysettingspage.cpp
@@ -51,7 +51,6 @@ NetworkProxySettingsPage::~NetworkProxySettingsPage() { delete ui_; }
 void NetworkProxySettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
 
   s.beginGroup(NetworkProxyFactory::kSettingsGroup);
   NetworkProxyFactory::Mode mode = NetworkProxyFactory::Mode(s.value("mode", NetworkProxyFactory::Mode_System).toInt());
@@ -80,6 +79,8 @@ void NetworkProxySettingsPage::Load() {
 
   Init(ui_->layout_networkproxysettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void NetworkProxySettingsPage::Save() {
diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp
index 8406cb00f..e55d4e082 100644
--- a/src/settings/notificationssettingspage.cpp
+++ b/src/settings/notificationssettingspage.cpp
@@ -56,8 +56,6 @@
 class QHideEvent;
 class QShowEvent;
 
-//const char *NotificationsSettingsPage::kSettingsGroup = "Notifications";
-
 NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
     : SettingsPage(dialog), ui_(new Ui_NotificationsSettingsPage), pretty_popup_(new OSDPretty(OSDPretty::Mode_Draggable)) {
 
@@ -142,7 +140,6 @@ void NotificationsSettingsPage::hideEvent(QHideEvent*) {
 void NotificationsSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(OSDBase::kSettingsGroup)) set_changed();
 
   s.beginGroup(OSDBase::kSettingsGroup);
   OSDBase::Behaviour osd_behaviour = OSDBase::Behaviour(s.value("Behaviour", OSDBase::Native).toInt());
@@ -202,6 +199,8 @@ void NotificationsSettingsPage::Load() {
 
   Init(ui_->layout_notificationssettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(OSDBase::kSettingsGroup)) set_changed();
+
 }
 
 void NotificationsSettingsPage::Save() {
diff --git a/src/settings/notificationssettingspage.h b/src/settings/notificationssettingspage.h
index 2e2d8c97b..2890badbd 100644
--- a/src/settings/notificationssettingspage.h
+++ b/src/settings/notificationssettingspage.h
@@ -43,8 +43,6 @@ class NotificationsSettingsPage : public SettingsPage {
   explicit NotificationsSettingsPage(SettingsDialog *dialog);
   ~NotificationsSettingsPage() override;
 
-  //static const char *kSettingsGroup;
-
   void Load() override;
   void Save() override;
 
diff --git a/src/settings/playlistsettingspage.cpp b/src/settings/playlistsettingspage.cpp
index 506e135fd..5f8e67a8c 100644
--- a/src/settings/playlistsettingspage.cpp
+++ b/src/settings/playlistsettingspage.cpp
@@ -49,8 +49,6 @@ PlaylistSettingsPage::~PlaylistSettingsPage() {
 void PlaylistSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
 
 #ifdef Q_OS_MACOS
@@ -97,6 +95,8 @@ void PlaylistSettingsPage::Load() {
 
   Init(ui_->layout_playlistsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void PlaylistSettingsPage::Save() {
diff --git a/src/settings/qobuzsettingspage.cpp b/src/settings/qobuzsettingspage.cpp
index 2985e5054..bf328557a 100644
--- a/src/settings/qobuzsettingspage.cpp
+++ b/src/settings/qobuzsettingspage.cpp
@@ -98,6 +98,8 @@ void QobuzSettingsPage::Load() {
 
   Init(ui_->layout_qobuzsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void QobuzSettingsPage::Save() {
diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp
index c4289efee..2bcdab179 100644
--- a/src/settings/scrobblersettingspage.cpp
+++ b/src/settings/scrobblersettingspage.cpp
@@ -123,6 +123,8 @@ void ScrobblerSettingsPage::Load() {
 
   Init(ui_->layout_scrobblersettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void ScrobblerSettingsPage::Save() {
diff --git a/src/settings/settingspage.h b/src/settings/settingspage.h
index ed7e8d213..230614fb6 100644
--- a/src/settings/settingspage.h
+++ b/src/settings/settingspage.h
@@ -31,6 +31,7 @@
 #include <QString>
 
 #include "osd/osdbase.h"
+#include "core/logging.h"
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp
index a7b0f3541..f1e529a6a 100644
--- a/src/settings/shortcutssettingspage.cpp
+++ b/src/settings/shortcutssettingspage.cpp
@@ -101,7 +101,6 @@ bool GlobalShortcutsSettingsPage::IsEnabled() const {
 void GlobalShortcutsSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
   s.beginGroup(kSettingsGroup);
 
   GlobalShortcuts *manager = dialog()->global_shortcuts_manager();
@@ -180,6 +179,8 @@ void GlobalShortcutsSettingsPage::Load() {
 
   Init(ui_->layout_globalshortcutssettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void GlobalShortcutsSettingsPage::Save() {
diff --git a/src/settings/subsonicsettingspage.cpp b/src/settings/subsonicsettingspage.cpp
index 0d1e4176a..0936c0197 100644
--- a/src/settings/subsonicsettingspage.cpp
+++ b/src/settings/subsonicsettingspage.cpp
@@ -65,8 +65,6 @@ SubsonicSettingsPage::~SubsonicSettingsPage() { delete ui_; }
 void SubsonicSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
   ui_->server_url->setText(s.value("url").toString());
@@ -81,6 +79,8 @@ void SubsonicSettingsPage::Load() {
 
   Init(ui_->layout_subsonicsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void SubsonicSettingsPage::Save() {
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index a97bbb70c..68057910c 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -85,8 +85,6 @@ TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
 void TidalSettingsPage::Load() {
 
   QSettings s;
-  if (!s.contains(kSettingsGroup)) set_changed();
-
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
   ui_->oauth->setChecked(s.value("oauth", true).toBool());
@@ -120,6 +118,8 @@ void TidalSettingsPage::Load() {
 
   Init(ui_->layout_tidalsettingspage->parentWidget());
 
+  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+
 }
 
 void TidalSettingsPage::Save() {