diff --git a/retroarch.c b/retroarch.c
index acdab4c52c..80bcc2192a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -8227,7 +8227,7 @@ static void global_free(struct rarch_state *p_rarch)
    p_rarch->rarch_bps_pref                            = false;
    p_rarch->rarch_ips_pref                            = false;
    p_rarch->rarch_ups_pref                            = false;
-   p_rarch->rarch_patch_blocked                       = false;
+   runloop_st->patch_blocked                          = false;
 #endif
 #ifdef HAVE_CONFIGFILE
    p_rarch->rarch_block_config_read                   = false;
@@ -17201,7 +17201,7 @@ static bool retroarch_parse_input_and_config(
 
             case RA_OPT_NO_PATCH:
 #ifdef HAVE_PATCH
-               p_rarch->rarch_patch_blocked = true;
+               runloop_st->patch_blocked = true;
 #endif
                break;
 
@@ -17816,8 +17816,6 @@ bool retroarch_ctl(enum rarch_ctl_state state, void *data)
          return (input_state_get_ptr()->bsv_movie_state_handle != NULL);
 #endif
 #ifdef HAVE_PATCH
-      case RARCH_CTL_IS_PATCH_BLOCKED:
-         return p_rarch->rarch_patch_blocked;
       case RARCH_CTL_IS_BPS_PREF:
          return p_rarch->rarch_bps_pref;
       case RARCH_CTL_UNSET_BPS_PREF:
diff --git a/retroarch_data.h b/retroarch_data.h
index 214e39ea01..ef90e934cf 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -627,9 +627,6 @@ struct rarch_state
    bool rarch_ups_pref;
    bool rarch_bps_pref;
    bool rarch_ips_pref;
-#ifdef HAVE_PATCH
-   bool rarch_patch_blocked;
-#endif
 
 #ifdef HAVE_ACCESSIBILITY
    /* Is text-to-speech accessibility turned on? */
diff --git a/retroarch_types.h b/retroarch_types.h
index 6cbd238ed0..b98cf8be0d 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -64,8 +64,6 @@ enum rarch_ctl_state
    RARCH_CTL_IS_BPS_PREF,
    RARCH_CTL_UNSET_BPS_PREF,
 
-   RARCH_CTL_IS_PATCH_BLOCKED,
-
    RARCH_CTL_IS_UPS_PREF,
    RARCH_CTL_UNSET_UPS_PREF,
 
diff --git a/runloop.h b/runloop.h
index 34f996b6c2..ddcc2cfb2d 100644
--- a/runloop.h
+++ b/runloop.h
@@ -258,6 +258,9 @@ struct runloop
    bool runahead_available;
    bool runahead_secondary_core_available;
    bool runahead_force_input_dirty;
+#endif
+#ifdef HAVE_PATCH
+   bool patch_blocked;
 #endif
    bool is_sram_load_disabled;
    bool is_sram_save_disabled;
diff --git a/tasks/task_content.c b/tasks/task_content.c
index ed3d9c5fa9..9c5771a07f 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1775,7 +1775,8 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
-   rarch_system_info_t *sys_info              = &runloop_state_get_ptr()->system;
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
+   rarch_system_info_t *sys_info              = &runloop_st->system;
    const char *path_dir_system                = settings->paths.directory_system;
    bool check_firmware_before_loading         = settings->bools.check_firmware_before_loading;
 
@@ -1787,7 +1788,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.bios_is_missing                = retroarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.directory_system               = NULL;
@@ -1872,7 +1873,8 @@ bool task_push_load_content_from_playlist_from_menu(
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
-   rarch_system_info_t *sys_info              = &runloop_state_get_ptr()->system;
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
+   rarch_system_info_t *sys_info              = &runloop_st->system;
    const char *path_dir_system                = settings->paths.directory_system;
 #ifndef HAVE_DYNAMIC
    bool force_core_reload                     = settings->bools.always_reload_core_on_run_content;
@@ -1883,7 +1885,7 @@ bool task_push_load_content_from_playlist_from_menu(
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.bios_is_missing                = retroarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.directory_system               = NULL;
@@ -2014,6 +2016,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
    const char *path_dir_system                = settings->paths.directory_system;
    bool check_firmware_before_loading         = settings->bools.check_firmware_before_loading;
 
@@ -2025,7 +2028,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.bios_is_missing                = retroarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.directory_system               = NULL;
@@ -2146,6 +2149,7 @@ bool task_push_load_content_with_new_core_from_menu(
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
    bool check_firmware_before_loading         = settings->bools.check_firmware_before_loading;
    const char *path_dir_system                = settings->paths.directory_system;
 #ifndef HAVE_DYNAMIC
@@ -2167,7 +2171,7 @@ bool task_push_load_content_with_new_core_from_menu(
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.bios_is_missing                = retroarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.directory_system               = NULL;
@@ -2266,7 +2270,8 @@ static bool task_load_content_internal(
    bool ret                                   = false;
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
-   rarch_system_info_t *sys_info              = &runloop_state_get_ptr()->system;
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
+   rarch_system_info_t *sys_info              = &runloop_st->system;
    settings_t *settings                       = config_get_ptr();
    bool check_firmware_before_loading         = settings->bools.check_firmware_before_loading;
    bool set_supports_no_game_enable           = settings->bools.set_supports_no_game_enable;
@@ -2278,7 +2283,7 @@ static bool task_load_content_internal(
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.bios_is_missing                = retroarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.directory_system               = NULL;
@@ -2771,7 +2776,8 @@ bool content_init(void)
    bool ret                                   = true;
    char *error_string                         = NULL;
    global_t *global                           = global_get_ptr();
-   rarch_system_info_t *sys_info              = &runloop_state_get_ptr()->system;
+   runloop_state_t *runloop_st                = runloop_state_get_ptr();
+   rarch_system_info_t *sys_info              = &runloop_st->system;
    settings_t *settings                       = config_get_ptr();
    bool check_firmware_before_loading         = settings->bools.check_firmware_before_loading;
    bool set_supports_no_game_enable           = settings->bools.set_supports_no_game_enable;
@@ -2786,7 +2792,7 @@ bool content_init(void)
    content_ctx.is_ips_pref                    = retroarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
    content_ctx.is_bps_pref                    = retroarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
    content_ctx.is_ups_pref                    = retroarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
-   content_ctx.patch_is_blocked               = retroarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
+   content_ctx.patch_is_blocked               = runloop_st->patch_blocked;
 #endif
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;