diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index 58eb94f0b7..269a518332 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -1816,9 +1816,6 @@ static bool d3d9_set_shader(void *data,
       free(d3d->shader_path);
    d3d->shader_path = NULL;
 
-   if (string_is_empty(path))
-      return true;
-
    switch (type)
    {
       case RARCH_SHADER_CG:
@@ -1828,7 +1825,6 @@ static bool d3d9_set_shader(void *data,
          break;
       default:
          RARCH_WARN("[D3D9]: Only Cg shaders are supported. Falling back to stock.\n");
-         return false;
    }
 
    if (!d3d9_process_shader(d3d) || !d3d9_restore(d3d))
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 4a86a5c3d4..f66e7c1bbe 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -4070,15 +4070,6 @@ static bool gl2_set_shader(void *data,
 
    gl2_context_bind_hw_render(gl, false);
 
-   gl->shader->deinit(gl->shader_data);
-   gl->shader_data = NULL;
-
-   if (string_is_empty(path))
-   {
-      gl2_context_bind_hw_render(gl, true);
-      return true;
-   }
-
    fallback = gl2_get_fallback_shader_type(type);
 
    if (fallback == RARCH_SHADER_NONE)
@@ -4087,6 +4078,9 @@ static bool gl2_set_shader(void *data,
       goto error;
    }
 
+   gl->shader->deinit(gl->shader_data);
+   gl->shader_data = NULL;
+
    if (type != fallback)
    {
       RARCH_ERR("[GL]: %s shader not supported, falling back to stock %s\n",