diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
index 2c0bac716a..f7c874fad7 100644
--- a/gfx/drivers_shader/shader_null.c
+++ b/gfx/drivers_shader/shader_null.c
@@ -61,12 +61,6 @@ static void shader_null_set_uniform_parameter(
 {
 }
 
-static unsigned shader_null_num(void *data)
-{
-   return 0;
-}
-
-
 static unsigned shader_null_get_prev_textures(void *data)
 {
    return 0;
@@ -99,7 +93,7 @@ const shader_backend_t shader_null_backend = {
    shader_null_set_uniform_parameter,
    shader_null_compile_program,
    NULL,
-   shader_null_num,
+   NULL,
    NULL,
    NULL,
    NULL,
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 894b2a3726..5a479e0397 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -210,6 +210,11 @@ static bool video_shader_driver_filter_type_null(void *data, unsigned idx, bool
    return false;
 }
 
+static unsigned video_shader_driver_num_null(void *data)
+{
+   return 0;
+}
+
 static void video_shader_driver_reset_to_defaults(void)
 {
    if (!current_shader->wrap_type)
@@ -228,6 +233,8 @@ static void video_shader_driver_reset_to_defaults(void)
       current_shader->mipmap_input      = video_shader_driver_mipmap_input_null;
    if (!current_shader->filter_type)
       current_shader->filter_type       = video_shader_driver_filter_type_null;
+   if (!current_shader->num_shaders)
+      current_shader->num_shaders       = video_shader_driver_num_null;
 }
 
 /* Finds first suitable shader context driver. */
@@ -293,9 +300,8 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
    if (!shader_info)
       return false;
 
-   shader_info->num = 0;
-   if (current_shader->num_shaders)
-      shader_info->num = current_shader->num_shaders(shader_data);
+   shader_info->num = current_shader->num_shaders(shader_data);
+
    return true;
 }