diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index e865a358f8..a8ba7357da 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -529,9 +529,7 @@ bool audio_driver_stop(void)
 void audio_driver_set_nonblock_state(bool toggle)
 {
    driver_t *driver     = driver_get_ptr();
-   if (driver
-         && driver->audio
-         && driver->audio->set_nonblock_state)
+   if (driver && driver->audio)
       driver->audio->set_nonblock_state(driver->audio_data, toggle);
 }
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index d7a19a5c97..e4b77e486c 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -572,8 +572,6 @@ bool video_driver_has_windowed(void)
 
    if (!driver || !driver->video)
       return false;
-   /* If video driver/context does not support windowed
-    * mode, don't perform command. */
    return driver->video->has_windowed(driver->video_data);
 }
 
@@ -581,9 +579,7 @@ void video_driver_set_nonblock_state(bool toggle)
 {
    driver_t *driver     = driver_get_ptr();
 
-   if (driver
-         && driver->video
-         && driver->video->set_nonblock_state)
+   if (driver && driver->video)
       driver->video->set_nonblock_state(driver->video_data, toggle);
 }