diff --git a/config.def.h b/config.def.h
index 727327ccaf..fd2780e72f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -284,8 +284,6 @@
 #include "menu/menu_driver.h"
 #include "menu/menu_animation.h"
 
-#define DEFAULT_BLOCK_CONFIG_READ true
-
 #ifdef HAVE_LIBNX
 #define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true
 #else
@@ -405,7 +403,10 @@ static unsigned rgui_aspect_lock = RGUI_ASPECT_RATIO_LOCK_NONE;
 static bool rgui_shadows = false;
 static unsigned rgui_particle_effect = RGUI_PARTICLE_EFFECT_NONE;
 static bool rgui_extended_ascii = false;
+#endif
 
+#ifdef HAVE_MENU
+#define DEFAULT_BLOCK_CONFIG_READ true
 #else
 #define DEFAULT_BLOCK_CONFIG_READ false
 #endif
@@ -446,7 +447,7 @@ static unsigned input_backtouch_toggle       = false;
 
 #define DEFAULT_SHOW_PHYSICAL_INPUTS true
 
-static bool all_users_control_menu = false;
+#define DEFAULT_ALL_USERS_CONTROL_MENU false
 
 #if defined(ANDROID) || defined(_WIN32)
 static bool menu_swap_ok_cancel_buttons = true;
diff --git a/configuration.c b/configuration.c
index 196862a5cd..6d04d33d4e 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1355,7 +1355,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("desktop_menu_enable",           &settings->bools.desktop_menu_enable, true, desktop_menu_enable, false);
    SETTING_BOOL("video_gpu_record",              &settings->bools.video_gpu_record, true, DEFAULT_GPU_RECORD, false);
    SETTING_BOOL("input_remap_binds_enable",      &settings->bools.input_remap_binds_enable, true, true, false);
-   SETTING_BOOL("all_users_control_menu",        &settings->bools.input_all_users_control_menu, true, all_users_control_menu, false);
+   SETTING_BOOL("all_users_control_menu",        &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false);
    SETTING_BOOL("menu_swap_ok_cancel_buttons",   &settings->bools.input_menu_swap_ok_cancel_buttons, true, menu_swap_ok_cancel_buttons, false);
 #ifdef HAVE_NETWORKING
    SETTING_BOOL("netplay_public_announce",       &settings->bools.netplay_public_announce, true, DEFAULT_NETPLAY_PUBLIC_ANNOUNCE, false);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 397caf6177..968f2b4968 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9863,7 +9863,7 @@ static bool setting_append_list(
                   &settings->bools.input_all_users_control_menu,
                   MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU,
                   MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU,
-                  all_users_control_menu,
+                  DEFAULT_ALL_USERS_CONTROL_MENU,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,