diff --git a/.pick_status.json b/.pick_status.json
index 45ce9ce792e..97fe6e651f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2294,7 +2294,7 @@
         "description": "gfxstream: get rid of logspam in virtualized case",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
index 4e0be98e23d..5c057f50bc3 100644
--- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
+++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
@@ -7,9 +7,9 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <xf86drm.h>
-#include <sys/stat.h>
 
 #include <cerrno>
 #include <cstring>
@@ -18,6 +18,7 @@
 
 #include "LinuxVirtGpu.h"
 #include "drm-uapi/virtgpu_drm.h"
+#include "util/detect_os.h"
 #include "util/log.h"
 #include "virtgpu_gfxstream_protocol.h"
 
@@ -192,6 +193,13 @@ int32_t LinuxVirtGpuDevice::init(int32_t descriptor) {
         mCaps.params[i] = params[i].value;
     }
 
+#if !DETECT_OS_ANDROID
+    if ((mCaps.params[kParamSupportedCapsetIds] & (1 << VIRTGPU_CAPSET_GFXSTREAM_VULKAN)) ==
+        0) {
+        return -EINVAL;
+    }
+#endif
+
     auto capset = getCapset();
     get_caps.cap_set_id = static_cast<uint32_t>(capset);
     switch (capset) {