diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 06052877414..8b15334708b 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -155,10 +155,12 @@ fill_state_base_addr(struct anv_cmd_buffer *cmd_buffer,
    sba->IndirectObjectBufferSizeModifyEnable  = true;
 
    sba->InstructionBaseAddress =
-      (struct anv_address) { device->instruction_state_pool.block_pool.bo, 0 };
+      (struct anv_address) {
+         .offset = device->physical->va.instruction_state_pool.addr,
+      };
+
    sba->InstructionMOCS = mocs;
-   sba->InstructionBufferSize =
-      device->physical->va.instruction_state_pool.size / 4096;
+   sba->InstructionBufferSize = (device->physical->va.instruction_state_pool.size / 4096);
    sba->InstructionBaseAddressModifyEnable = true;
    sba->InstructionBuffersizeModifyEnable = true;
 
diff --git a/src/intel/vulkan/genX_init_state.c b/src/intel/vulkan/genX_init_state.c
index 4b37f59e439..5e64ca69687 100644
--- a/src/intel/vulkan/genX_init_state.c
+++ b/src/intel/vulkan/genX_init_state.c
@@ -285,10 +285,12 @@ init_common_queue_state(struct anv_queue *queue, struct anv_batch *batch)
       sba.IndirectObjectBufferSizeModifyEnable = true;
 
       sba.InstructionBaseAddress =
-         (struct anv_address) { .offset =
-         device->physical->va.instruction_state_pool.addr,
-      };
-      sba.InstructionBufferSize = device->physical->va.instruction_state_pool.size / 4096;
+         (struct anv_address) {
+            .offset = device->physical->va.instruction_state_pool.addr,
+         };
+      sba.InstructionBufferSize =
+         device->physical->va.instruction_state_pool.size / 4096;
+
       sba.InstructionMOCS = mocs;
       sba.InstructionBaseAddressModifyEnable = true;
       sba.InstructionBuffersizeModifyEnable = true;