diff --git a/general.h b/general.h
index 112e24fe53..636ebf8028 100644
--- a/general.h
+++ b/general.h
@@ -217,6 +217,9 @@ struct settings
       } navigation;
       bool collapse_subgroups_enable;
       bool show_advanced_settings;
+#ifdef HAVE_THREADS
+      bool threaded_data_runloop_enable;
+#endif
 
       unsigned entry_normal_color;
       unsigned entry_hover_color;
diff --git a/settings.c b/settings.c
index f5ee8a2a28..3635dc4606 100644
--- a/settings.c
+++ b/settings.c
@@ -412,6 +412,9 @@ static void config_set_defaults(void)
    if (g_defaults.settings.video_threaded_enable != video_threaded)
       g_settings.video.threaded = g_defaults.settings.video_threaded_enable;
 
+#ifdef HAVE_THREADS
+   g_settings.menu.threaded_data_runloop_enable = true;
+#endif
    g_settings.video.shared_context = video_shared_context;
    g_settings.video.force_srgb_disable = false;
 #ifdef GEKKO
@@ -1118,6 +1121,9 @@ static bool config_load_file(const char *path, bool set_defaults)
    CONFIG_GET_BOOL(video.hard_sync, "video_hard_sync");
 
 #ifdef HAVE_MENU
+#ifdef HAVE_THREADS
+   CONFIG_GET_BOOL(menu.threaded_data_runloop_enable, "threaded_data_runloop_enable");
+#endif
    CONFIG_GET_BOOL(menu.pause_libretro, "menu_pause_libretro");
    CONFIG_GET_BOOL(menu.mouse.enable,   "menu_mouse_enable");
    CONFIG_GET_BOOL(menu.timedate_enable,   "menu_timedate_enable");
@@ -1893,6 +1899,9 @@ bool config_save_file(const char *path)
    config_set_int(conf,   "video_fullscreen_y", g_settings.video.fullscreen_y);
    config_set_string(conf,"video_driver", g_settings.video.driver);
 #ifdef HAVE_MENU
+#ifdef HAVE_THREADS
+   config_set_bool(conf,"threaded_data_runloop_enable", g_settings.menu.threaded_data_runloop_enable);
+#endif
    config_set_string(conf,"menu_driver", g_settings.menu.driver);
    config_set_bool(conf,"menu_pause_libretro", g_settings.menu.pause_libretro);
    config_set_bool(conf,"menu_mouse_enable", g_settings.menu.mouse.enable);
diff --git a/settings_data.c b/settings_data.c
index 95f51e8322..cace4a5417 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -5256,6 +5256,20 @@ static bool setting_data_append_list_menu_options(
          general_write_handler,
          general_read_handler);
 
+#ifdef HAVE_THREADS
+   CONFIG_BOOL(
+         g_settings.menu.threaded_data_runloop_enable,
+         "threaded_data_runloop_enable",
+         "Threaded data runloop",
+         true,
+         "OFF",
+         "ON",
+         group_info.name,
+         subgroup_info.name,
+         general_write_handler,
+         general_read_handler);
+#endif
+
    /* These colors are hints. The menu driver is not required to use them. */
    CONFIG_HEX(
          g_settings.menu.entry_normal_color,