diff --git a/retroarch.c b/retroarch.c
index 45419c3132..2f94951c0a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2300,12 +2300,11 @@ bool command_event(enum event_command cmd, void *data)
 #if HAVE_RUNAHEAD
          {
             bool old_warn   = settings->bools.preemptive_frames_hide_warnings;
-            bool old_inited = runloop_st->preempt_data;
+            bool old_inited = runloop_st->preempt_data != NULL;
 
             /* Toggle with warnings shown */
             settings->bools.preemptive_frames_hide_warnings = false;
-
-            settings->bools.preemptive_frames_enable =
+            settings->bools.preemptive_frames_enable        =
                   !(settings->bools.preemptive_frames_enable);
             command_event(CMD_EVENT_PREEMPT_UPDATE, NULL);
 
@@ -2328,7 +2327,7 @@ bool command_event(enum event_command cmd, void *data)
                      NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
                /* Disable runahead */
-               settings->bools.run_ahead_enabled = false;
+               settings->bools.run_ahead_enabled        = false;
             }
             else /* Failed to init */
                settings->bools.preemptive_frames_enable = false;