diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
index 653e9c456dd..794da0f16d7 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
@@ -2033,7 +2033,7 @@ prepare_dcd(struct panvk_cmd_buffer *cmdbuf,
    if (dcd1_dirty) {
       struct mali_dcd_flags_1_packed dcd1;
       pan_pack(&dcd1, DCD_FLAGS_1, cfg) {
-         cfg.sample_mask = msaa ? dyns->ms.sample_mask : UINT16_MAX;
+         cfg.sample_mask = dyns->ms.sample_mask;
          cfg.render_target_mask = rt_written;
       }
 
diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
index 22abb454d4e..0b532d1ea58 100644
--- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
@@ -331,8 +331,7 @@ panvk_draw_prepare_fs_rsd(struct panvk_cmd_buffer *cmdbuf,
       }
 
       cfg.multisample_misc.multisample_enable = msaa;
-      cfg.multisample_misc.sample_mask =
-         msaa ? dyns->ms.sample_mask : UINT16_MAX;
+      cfg.multisample_misc.sample_mask = dyns->ms.sample_mask;
 
       cfg.multisample_misc.depth_function =
          test_z ? translate_compare_func(ds->depth.compare_op)