diff --git a/src/vulkan/util/vk_log.c b/src/vulkan/util/vk_log.c
index a04c00e8997..fbde25613d8 100644
--- a/src/vulkan/util/vk_log.c
+++ b/src/vulkan/util/vk_log.c
@@ -51,6 +51,7 @@ __vk_log_impl(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
    } else {
       objects = (struct vk_object_base **) objects_or_instance;
       instance = objects[0]->device->physical->instance;
+      assert(instance->base.client_visible);
    }
 
 #ifndef DEBUG
@@ -98,6 +99,14 @@ __vk_log_impl(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
    }
 #endif
 
+   if (!instance->base.client_visible) {
+      vk_debug_message_instance(instance, severity, types,
+                                message_idname, 0, message);
+      ralloc_free(message);
+      ralloc_free(message_idname);
+      return;
+   }
+
    /* If VK_EXT_debug_utils messengers have been set up, form the
     * message */
    if (!list_is_empty(&instance->debug_utils.callbacks)) {