diff --git a/dynamic.c b/dynamic.c
index 844f8312ac..4e005e556e 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -721,8 +721,12 @@ bool rarch_environment_cb(unsigned cmd, void *data)
                      "retroarch-core-options.cfg", sizeof(buf));
                options_path = buf;
             }
+            
             char *game_options_path = NULL;
-            bool ret = rarch_game_specific_options(&game_options_path);
+            bool ret = false;
+            
+            if (settings->game_specific_options)
+               ret = rarch_game_specific_options(&game_options_path);
 
             if(ret)
                system->core_options = core_option_new(game_options_path, vars);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index c399bbbb5d..45adf1d2c4 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -3477,6 +3477,20 @@ static bool setting_append_list_configuration_options(
          general_write_handler,
          general_read_handler);
 
+CONFIG_BOOL(
+      settings->game_specific_options,
+      menu_hash_to_str(MENU_LABEL_GAME_SPECIFIC_OPTIONS),
+      menu_hash_to_str(MENU_LABEL_VALUE_GAME_SPECIFIC_OPTIONS),
+      default_game_specific_options,
+      menu_hash_to_str(MENU_VALUE_OFF),
+      menu_hash_to_str(MENU_VALUE_ON),
+      group_info.name,
+      subgroup_info.name,
+      parent_group,
+      general_write_handler,
+      general_read_handler);
+         
+
    CONFIG_BOOL(
          settings->auto_overrides_enable,
          menu_hash_to_str(MENU_LABEL_AUTO_OVERRIDES_ENABLE),