diff --git a/src/gallium/drivers/r600/sfn/sfn_instr.h b/src/gallium/drivers/r600/sfn/sfn_instr.h
index c8ca38f3db3..4f4d06875c8 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instr.h
+++ b/src/gallium/drivers/r600/sfn/sfn_instr.h
@@ -294,8 +294,9 @@ public:
 
    auto buffer_index_mode() const -> EBufferIndexMode
    {
-      if (!m_offset)
+      if (!m_offset || !m_offset->has_flag(Register::addr_or_idx))
          return bim_none;
+
       switch (m_offset->sel()) {
       case 1:
          return bim_zero;