diff --git a/src/compiler/glsl/gl_nir_lower_images.c b/src/compiler/glsl/gl_nir_lower_images.c
index ee74004de9d..34c51dcff8e 100644
--- a/src/compiler/glsl/gl_nir_lower_images.c
+++ b/src/compiler/glsl/gl_nir_lower_images.c
@@ -87,7 +87,9 @@ lower_impl(nir_builder *b, nir_instr *instr, bool bindless_only)
       return false;
    }
 
-   bool bindless = var->data.mode != nir_var_uniform || var->data.bindless;
+   bool bindless = (var->data.mode != nir_var_uniform &&
+                    var->data.mode != nir_var_mem_image) ||
+                   var->data.bindless;
    if (bindless_only && !bindless)
       return false;