diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c
index 84af734323..0352c13cce 100644
--- a/console/rmenu/rmenu.c
+++ b/console/rmenu/rmenu.c
@@ -2403,8 +2403,6 @@ bool rmenu_iterate(void)
 
    if(preinit)
    {
-      device_ptr->block_swap = true;
-
       if(g_extern.console.rmenu.state.ingame_menu.enable)
          menu_stack_push(INGAME_MENU);
 
@@ -2468,6 +2466,7 @@ bool rmenu_iterate(void)
    }
 
    device_ptr->ctx_driver->swap_buffers();
+
    bool quit, resize;
    unsigned width, height, frame_count;
    frame_count = 0;
@@ -2492,7 +2491,6 @@ deinit:
    if(g_extern.console.rmenu.state.ingame_menu.enable)
       menu_stack_pop();
 
-   device_ptr->block_swap = false;
    g_extern.draw_menu = false;
    g_extern.console.rmenu.state.ingame_menu.enable = false;
 
diff --git a/gfx/gl.c b/gfx/gl.c
index f55b29693b..efcf37abb9 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1188,15 +1188,12 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
 
    RARCH_PERFORMANCE_STOP(frame_run);
 
-#if defined(HAVE_RMENU)
-   if (!gl->block_swap)
-#endif
-      context_swap_buffers_func();
-
 #ifdef HAVE_RMENU
    if (g_extern.draw_menu)
       context_rmenu_frame_func(gl);
+   else
 #endif
+      context_swap_buffers_func();
 
 #if !defined(HAVE_OPENGLES) && defined(HAVE_FFMPEG)
    if (gl->pbo_readback_enable)
@@ -1745,10 +1742,6 @@ static void gl_restart(void)
    if (!gl)
 	   return;
 
-#ifdef HAVE_RMENU
-   bool should_block_swap = gl->block_swap;
-#endif
-
    gl_stop();
 #ifdef HAVE_CG
    gl_cg_invalidate_context();
@@ -1756,7 +1749,6 @@ static void gl_restart(void)
    gl_start();
 
 #ifdef HAVE_RMENU
-   gl->block_swap = should_block_swap;
    SET_TIMER_EXPIRATION(0, 30);
 #endif
 
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 4d7ee7067b..f09759d372 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -277,10 +277,6 @@ typedef struct gl
    GLfloat font_color[16];
    GLfloat font_color_dark[16];
 
-#ifdef HAVE_RMENU
-   bool block_swap;
-#endif
-
    bool egl_images;
 
 #if !defined(HAVE_OPENGLES) && defined(HAVE_FFMPEG)