diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild
index 7326bb94a600c..17952ddce99e1 100644
--- a/media-libs/mesa/mesa-20.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild
@@ -372,6 +372,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -492,7 +498,6 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
 		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 72ea1d60ab56f..2e217a5233af5 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -371,6 +371,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -491,7 +497,6 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
 		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)