diff --git a/.pick_status.json b/.pick_status.json
index e0822a4e368..817bc8c959a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -805,7 +805,7 @@
         "description": "radv: disable IMAGE_USAGE_STORAGE with depth-only and stencil-only formats",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index 96e71d366a7..63e4ad5fb2c 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -540,6 +540,9 @@ radv_is_storage_image_format_supported(struct radv_physical_device *physical_dev
    if (format == VK_FORMAT_UNDEFINED)
       return false;
 
+   if (vk_format_is_depth_or_stencil(format))
+      return false;
+
    data_format =
       radv_translate_tex_dataformat(format, desc, vk_format_get_first_non_void_channel(format));
    num_format =