diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index e3479ea00c..4ceb7ba3d1 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -422,8 +422,8 @@ static void xrandr_read(struct vo_x11_state *x11)
             int intel = bstr_find0(provider_name, "intel");
             int nvidia = bstr_find0(provider_name, "nvidia");
             int radeon = bstr_find0(provider_name, "radeon");
-            x11->has_mesa = amd >= 0 || intel >= 0 || radeon >= 0;
-            x11->has_nvidia = nvidia >= 0;
+            x11->has_mesa = x11->has_mesa || amd >= 0 || intel >= 0 || radeon >= 0;
+            x11->has_nvidia = x11->has_nvidia || nvidia >= 0;
         }
         XRRFreeProviderResources(pr);
     }