diff --git a/docs/drivers/zink.rst b/docs/drivers/zink.rst
index d53a526f6f6..252d76199d1 100644
--- a/docs/drivers/zink.rst
+++ b/docs/drivers/zink.rst
@@ -135,7 +135,8 @@ supported:
 
 * ``VkPhysicalDeviceLimits``:
 
-  * ``shaderStorageImageReadWithoutFormat``
+  * ``shaderStorageImageExtendedFormats``
+  * ``shaderStorageImageWriteWithoutFormat``
 
 * For Vulkan 1.2 and above:
   
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index aca1c577fb9..7839cb3df13 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -750,7 +750,8 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_TGSI);
 
    case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
-      if (screen->info.feats.features.shaderStorageImageExtendedFormats)
+      if (screen->info.feats.features.shaderStorageImageExtendedFormats &&
+          screen->info.feats.features.shaderStorageImageWriteWithoutFormat)
          return MIN2(screen->info.props.limits.maxPerStageDescriptorStorageImages,
                      PIPE_MAX_SHADER_IMAGES);
       return 0;