diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
index 1c904dab6834c..945a190f50f92 100644
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
@@ -19,6 +19,7 @@ IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +sui
 CDEPEND="libglvnd? (
 		media-libs/libglvnd[X]
 		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
 	)
 	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 7329385727d96..b5c728873e8ad 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -20,6 +20,7 @@ IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +sui
 CDEPEND="libglvnd? (
 		media-libs/libglvnd[X]
 		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
 	)
 	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
 	!libressl? ( dev-libs/openssl:0= )