diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 0b0a0a3764c..cba1d1c5e7c 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1146,7 +1146,8 @@ static void x11_notify_pending_present(struct x11_swapchain *swapchain,
    /* It is possible that an IDLE is observed before PRESENT_COMPLETE when
     * not flipping. In this case, reading image->present_id might be a race
     * in the FIFO management thread. */
-   image->signal_present_id = image->present_id;
+   if (image->present_id)
+      image->signal_present_id = image->present_id;
 }
 
 static void x11_swapchain_notify_error(struct x11_swapchain *swapchain, VkResult result)