diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
index 8629ac8598d..9d2f1280ca9 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
@@ -207,9 +207,7 @@ static void scan_instruction(const struct nir_shader *nir,
             info->uses_bindless_image_load = true;
          break;
       case nir_intrinsic_bindless_image_store:
-         if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
-            info->uses_bindless_buffer_store = true;
-         else
+         if (nir_intrinsic_image_dim(intr) != GLSL_SAMPLER_DIM_BUF)
             info->uses_bindless_image_store = true;
 
          info->writes_memory = true;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 96a693cb85d..95fa4fad707 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -280,9 +280,7 @@ scan_instruction(struct tgsi_shader_info *info,
       break;
    case TGSI_OPCODE_STORE:
       if (tgsi_is_bindless_image_file(fullinst->Dst[0].Register.File)) {
-         if (fullinst->Memory.Texture == TGSI_TEXTURE_BUFFER)
-            info->uses_bindless_buffer_store = true;
-         else
+         if (fullinst->Memory.Texture != TGSI_TEXTURE_BUFFER)
             info->uses_bindless_image_store = true;
       }
       break;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 44595e177fe..783dbc89d4d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -119,7 +119,6 @@ struct tgsi_shader_info
    unsigned shader_buffers_load; /**< bitmask of shader buffers using loads */
    unsigned shader_buffers_store; /**< bitmask of shader buffers using stores */
    unsigned shader_buffers_atomic; /**< bitmask of shader buffers using atomics */
-   bool uses_bindless_buffer_store;
    bool uses_bindless_buffer_atomic;
    bool uses_bindless_image_load;
    bool uses_bindless_image_store;