diff --git a/.pick_status.json b/.pick_status.json
index d89d082445a..9c6b0a02aff 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1214,7 +1214,7 @@
         "description": "panvk: avoid dereferencing a null-pointer",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d970fe2e9d6a8e9997a0ce212146d62013b3b455",
         "notes": null
diff --git a/src/panfrost/vulkan/panvk_formats.c b/src/panfrost/vulkan/panvk_formats.c
index 956d4691677..3186b5dedff 100644
--- a/src/panfrost/vulkan/panvk_formats.c
+++ b/src/panfrost/vulkan/panvk_formats.c
@@ -414,6 +414,13 @@ panvk_GetPhysicalDeviceImageFormatProperties2(
     *    present and VkExternalImageFormatProperties will be ignored.
     */
    if (external_info && external_info->handleType != 0) {
+      VkExternalImageFormatProperties fallback_external_props;
+
+      if (!external_props) {
+         memset(&fallback_external_props, 0, sizeof(fallback_external_props));
+         external_props = &fallback_external_props;
+      }
+
       result = panvk_get_external_image_format_properties(
          physical_device, base_info, external_info->handleType,
          &external_props->externalMemoryProperties);