diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c
index 77b1ac69af..df090608cf 100644
--- a/gfx/shader_glsl.c
+++ b/gfx/shader_glsl.c
@@ -610,6 +610,7 @@ static void find_uniforms(unsigned pass, GLuint prog, struct shader_uniforms *un
    for (unsigned i = 0; i < GFX_MAX_SHADERS; i++)
    {
       snprintf(frame_base, sizeof(frame_base), "Pass%u", i + 1);
+      clear_uniforms_frame(&uni->pass[i]);
       find_uniforms_frame(prog, &uni->pass[i], frame_base);
       if (i && pass > i + 1)
       {
@@ -618,6 +619,7 @@ static void find_uniforms(unsigned pass, GLuint prog, struct shader_uniforms *un
       }
    }
 
+   clear_uniforms_frame(&uni->prev[0]);
    find_uniforms_frame(prog, &uni->prev[0], "Prev");
    for (unsigned i = 1; i < PREV_TEXTURES; i++)
    {