diff --git a/command.c b/command.c
index 878a24f211..bcf04f0540 100644
--- a/command.c
+++ b/command.c
@@ -1865,13 +1865,17 @@ bool command_event(enum event_command cmd, void *data)
             if (settings->bools.cheevos_hardcore_mode_enable)
                return false;
 #endif
+            if (settings->bools.rewind_enable)
+            {
 #ifdef HAVE_NETWORKING
-            /* Only enable state manager if netplay is not underway 
-               TODO: Add a setting for these tweaks */
-            if (settings->bools.rewind_enable
-               && !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
+               /* Only enable state manager if netplay is not underway 
+TODO: Add a setting for these tweaks */
+               if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
 #endif
-               state_manager_event_init((unsigned)settings->rewind_buffer_size);
+               {
+                  state_manager_event_init((unsigned)settings->rewind_buffer_size);
+               }
+            }
          }
          break;
       case CMD_EVENT_REWIND_TOGGLE: