diff --git a/libretro_version_1.c b/libretro_version_1.c
index 918be1cd58..1288dbc327 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -301,12 +301,12 @@ static int16_t input_state(unsigned port, unsigned device,
       g_settings.input.binds[15],
    };
 
-   if (!driver.block_libretro_input &&
-         ((id < RARCH_FIRST_META_KEY ||
-            device == RETRO_DEVICE_KEYBOARD))
-         )
-      res = driver.input->input_state(driver.input_data, binds, port,
-            device, idx, id);
+   if (!driver.block_libretro_input)
+   {
+      if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
+         res = driver.input->input_state(driver.input_data, binds, port,
+               device, idx, id);
+   }
 
 #ifdef HAVE_OVERLAY
    if (device == RETRO_DEVICE_JOYPAD && port == 0)
diff --git a/runloop.c b/runloop.c
index 4308ee2532..1baff0c809 100644
--- a/runloop.c
+++ b/runloop.c
@@ -599,8 +599,11 @@ static inline retro_input_t input_keys_pressed(void)
       input_push_analog_dpad(g_settings.input.autoconf_binds[i],
             g_settings.input.analog_dpad_mode[i]);
 
-      g_extern.turbo_frame_enable[i] = driver.block_libretro_input ? 0 :
-         driver.input->input_state(driver.input_data, binds, i,
+      if (driver.block_libretro_input)
+         g_extern.turbo_frame_enable[i] = 0;
+      else
+         g_extern.turbo_frame_enable[i] = 
+            driver.input->input_state(driver.input_data, binds, i,
                RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE);
    }