diff --git a/Manual.org b/Manual.org
index 14f0fbc..c029e5d 100644
--- a/Manual.org
+++ b/Manual.org
@@ -2820,7 +2820,7 @@ preferred_refreshrates:
     src: templates/20-intel.conf.j2
     dest: /etc/X11/xorg.conf.d/20-intel.conf
   when:
-    - intel_detected
+    - intel_detected and not nvidia_detected
 
 - name: server flags config snippet to disable screen blanking
   template:
diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml
index f5c6e79..c094a6c 100644
--- a/roles/yavdr-xorg/tasks/detect-xorg.yml
+++ b/roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -173,7 +173,7 @@
     src: templates/20-intel.conf.j2
     dest: /etc/X11/xorg.conf.d/20-intel.conf
   when:
-    - intel_detected
+    - intel_detected and not nvidia_detected
 
 - name: server flags config snippet to disable screen blanking
   template: