diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 64ce2b90452..3cbf459c649 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -955,7 +955,12 @@ emit_3dstate_clip(struct anv_graphics_pipeline *pipeline,
       if (vp && vp->viewport_count > 0 &&
           mesh_prog_data->map.start_dw[VARYING_SLOT_VIEWPORT] >= 0) {
          clip.MaximumVPIndex = vp->viewport_count - 1;
+      } else {
+         clip.MaximumVPIndex = 0;
       }
+
+      clip.ForceZeroRTAIndexEnable =
+            mesh_prog_data->map.start_dw[VARYING_SLOT_LAYER] < 0;
    }
 
    clip.NonPerspectiveBarycentricEnable = wm_prog_data ?