diff --git a/retroarch.c b/retroarch.c
index 2bd81a5282..b3b647cea0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -14028,7 +14028,12 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_REWIND_DEINIT:
 #ifdef HAVE_REWIND
-         state_manager_event_deinit(&p_rarch->rewind_st);
+         {
+	    bool core_type_is_dummy   = p_rarch->current_core_type == CORE_TYPE_DUMMY;
+	    if (core_type_is_dummy)
+               return false;
+            state_manager_event_deinit(&p_rarch->rewind_st);
+         }
 #endif
          break;
       case CMD_EVENT_REWIND_INIT:
@@ -14036,6 +14041,9 @@ bool command_event(enum event_command cmd, void *data)
          {
             bool rewind_enable        = settings->bools.rewind_enable;
             size_t rewind_buf_size    = settings->sizes.rewind_buffer_size;
+	    bool core_type_is_dummy   = p_rarch->current_core_type == CORE_TYPE_DUMMY;
+	    if (core_type_is_dummy)
+               return false;
 #ifdef HAVE_CHEEVOS
             if (rcheevos_hardcore_active())
                return false;