diff --git a/src/core/system.cpp b/src/core/system.cpp
index 75401c807..685583643 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -791,6 +791,15 @@ void System::LoadSettings(bool display_osd_messages)
 void System::SetDefaultSettings(SettingsInterface& si)
 {
   Settings temp;
+
+  // we don't want to reset some things (e.g. OSD)
+  temp.display_show_osd_messages = g_settings.display_show_osd_messages;
+  temp.display_show_fps = g_settings.display_show_fps;
+  temp.display_show_speed = g_settings.display_show_speed;
+  temp.display_show_resolution = g_settings.display_show_resolution;
+  temp.display_show_cpu = g_settings.display_show_cpu;
+  temp.display_show_gpu = g_settings.display_show_gpu;
+
   temp.Save(si);
 }
 
diff --git a/src/frontend-common/common_host.cpp b/src/frontend-common/common_host.cpp
index 69ef1af97..a273ac5ff 100644
--- a/src/frontend-common/common_host.cpp
+++ b/src/frontend-common/common_host.cpp
@@ -287,18 +287,9 @@ void CommonHost::SetDefaultSettings(SettingsInterface& si)
   si.SetBoolValue("Main", "EnableDiscordPresence", false);
 #endif
 
-#ifdef WITH_CHEEVOS
-  si.SetBoolValue("Cheevos", "Enabled", false);
-  si.SetBoolValue("Cheevos", "TestMode", false);
-  si.SetBoolValue("Cheevos", "UnofficialTestMode", false);
-  si.SetBoolValue("Cheevos", "UseFirstDiscFromPlaylist", true);
-  si.DeleteValue("Cheevos", "Username");
-  si.DeleteValue("Cheevos", "Token");
-
-#ifdef WITH_RAINTEGRATION
+#if defined(WITH_CHEEVOS) && defined(WITH_RAINTEGRATION)
   si.SetBoolValue("Cheevos", "UseRAIntegration", false);
 #endif
-#endif
 }
 
 void CommonHost::SetDefaultControllerSettings(SettingsInterface& si)