diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 38f6b81f1a..e7b3ac687e 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -1153,7 +1153,10 @@ static void gl_glsl_set_params(void *data, void *shader_data,
          orig_uniforms[1].enabled        = true;
 
       for (j = 0; j < 2; j++)
-         gl_glsl_set_uniform_parameter(glsl, &orig_uniforms[j], NULL);
+      {
+         if (orig_uniforms[j].enabled)
+            gl_glsl_set_uniform_parameter(glsl, &orig_uniforms[j], NULL);
+      }
 
       /* Pass texture coordinates. */
       if (uni->orig.tex_coord >= 0)
@@ -1204,7 +1207,10 @@ static void gl_glsl_set_params(void *data, void *shader_data,
          feedback_uniforms[1].enabled        = true;
 
       for (j = 0; j < 2; j++)
-         gl_glsl_set_uniform_parameter(glsl, &feedback_uniforms[j], NULL);
+      {
+         if (feedback_uniforms[j].enabled)
+            gl_glsl_set_uniform_parameter(glsl, &feedback_uniforms[j], NULL);
+      }
 
       /* Pass texture coordinates. */
       if (uni->feedback.tex_coord >= 0)
@@ -1255,7 +1261,10 @@ static void gl_glsl_set_params(void *data, void *shader_data,
             fbo_tex_params[2].enabled  = true;
 
          for (j = 0; j < 3; j++)
-            gl_glsl_set_uniform_parameter(glsl, &fbo_tex_params[j], NULL);
+         {
+            if (fbo_tex_params[j].enabled)
+               gl_glsl_set_uniform_parameter(glsl, &fbo_tex_params[j], NULL);
+         }
 
          if (uni->pass[i].tex_coord >= 0)
          {
@@ -1307,7 +1316,10 @@ static void gl_glsl_set_params(void *data, void *shader_data,
          prev_tex_params[2].enabled  = true;
 
       for (j = 0; j < 3; j++)
-         gl_glsl_set_uniform_parameter(glsl, &prev_tex_params[j], NULL);
+      {
+         if (prev_tex_params[j].enabled)
+            gl_glsl_set_uniform_parameter(glsl, &prev_tex_params[j], NULL);
+      }
 
       /* Pass texture coordinates. */
       if (uni->prev[i].tex_coord >= 0)