diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
index 0dff9a0827..2c0bac716a 100644
--- a/gfx/drivers_shader/shader_null.c
+++ b/gfx/drivers_shader/shader_null.c
@@ -66,12 +66,6 @@ static unsigned shader_null_num(void *data)
    return 0;
 }
 
-static bool shader_null_filter_type(void *data, unsigned idx, bool *smooth)
-{
-   (void)idx;
-   (void)smooth;
-   return false;
-}
 
 static unsigned shader_null_get_prev_textures(void *data)
 {
@@ -106,7 +100,7 @@ const shader_backend_t shader_null_backend = {
    shader_null_compile_program,
    NULL,
    shader_null_num,
-   shader_null_filter_type,
+   NULL,
    NULL,
    NULL,
    NULL,
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 5c26456b62..894b2a3726 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -203,6 +203,13 @@ static bool video_shader_driver_mipmap_input_null(void *data, unsigned idx)
    return false;
 }
 
+static bool video_shader_driver_filter_type_null(void *data, unsigned idx, bool *smooth)
+{
+   (void)idx;
+   (void)smooth;
+   return false;
+}
+
 static void video_shader_driver_reset_to_defaults(void)
 {
    if (!current_shader->wrap_type)
@@ -219,6 +226,8 @@ static void video_shader_driver_reset_to_defaults(void)
       current_shader->shader_scale      = video_shader_driver_scale_null;
    if (!current_shader->mipmap_input)
       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;
 }
 
 /* Finds first suitable shader context driver. */
@@ -293,7 +302,6 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
 bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
 {
    if (     filter
-         && current_shader->filter_type 
          && current_shader->filter_type(shader_data,
             filter->index, filter->smooth))
       return true;