diff --git a/config.def.h b/config.def.h
index ae3e3aa7c6..15cb7f5c95 100644
--- a/config.def.h
+++ b/config.def.h
@@ -368,6 +368,10 @@ static const bool def_mouse_enable = true;
 static const bool def_mouse_enable = false;
 #endif
 
+#ifdef HAVE_CHEEVOS
+static const bool cheevos_enable = false;
+#endif
+
 /* VIDEO */
 
 #if defined(_XBOX360)
diff --git a/configuration.c b/configuration.c
index 7632b1646f..9e4f529d47 100644
--- a/configuration.c
+++ b/configuration.c
@@ -684,7 +684,7 @@ static void config_set_defaults(void)
    settings->camera.allow                           = false;
 
 #ifdef HAVE_CHEEVOS
-   settings->cheevos.enable                         = false;
+   settings->cheevos.enable                         = cheevos_enable;
    settings->cheevos.test_unofficial                = false;
    settings->cheevos.hardcore_mode_enable           = false;
    *settings->cheevos.username                      = '\0';
@@ -2689,11 +2689,6 @@ bool config_save_file(const char *path)
       { "video_smooth",                 settings->video.smooth},
       { "video_threaded",               settings->video.threaded},
       { "video_shared_context",         settings->video.shared_context},
-#ifdef HAVE_CHEEVOS
-      { "cheevos_enable",               settings->cheevos.enable},
-      { "cheevos_test_unofficial",      settings->cheevos.test_unofficial},
-      { "cheevos_hardcore_mode_enable", settings->cheevos.hardcore_mode_enable},
-#endif
       { "custom_bgm_enable",            global->console.sound.system_bgm_enable},
       { "auto_screenshot_filename",     settings->auto_screenshot_filename},
       { "video_force_srgb_disable",     settings->video.force_srgb_disable},
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index ec5ea31356..fbc4075d82 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7310,7 +7310,7 @@ static bool setting_append_list(
                &settings->cheevos.enable,
                msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_ENABLE),
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ENABLE),
-               false,
+               cheevos_enable,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,