diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 7196d8b2c1f..7249829c564 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -105,16 +105,20 @@ nir_setup_uniform_remap_tables(struct gl_context *ctx,
       unsigned location =
          link_util_find_empty_block(prog, &prog->data->UniformStorage[i]);
 
-      if (location == -1) {
-         location = prog->NumUniformRemapTable;
+      if (location == -1 || location + entries >= prog->NumUniformRemapTable) {
+         unsigned new_entries = entries;
+         if (location == -1)
+            location = prog->NumUniformRemapTable;
+         else
+            new_entries = location - prog->NumUniformRemapTable + entries;
 
          /* resize remap table to fit new entries */
          prog->UniformRemapTable =
             reralloc(prog,
                      prog->UniformRemapTable,
                      struct gl_uniform_storage *,
-                     prog->NumUniformRemapTable + entries);
-         prog->NumUniformRemapTable += entries;
+                     prog->NumUniformRemapTable + new_entries);
+         prog->NumUniformRemapTable += new_entries;
       }
 
       /* set the base location in remap table for the uniform */