diff --git a/roles/deploy-xorg/templates/xorg.conf.j2 b/roles/deploy-xorg/templates/xorg.conf.j2
index 2fc5f043c03e710be306d3b740cb6f5963216860..7f8b0f82076f6cfa81b34c4dd00a0d460cbe81a6 100644
--- a/roles/deploy-xorg/templates/xorg.conf.j2
+++ b/roles/deploy-xorg/templates/xorg.conf.j2
@@ -66,8 +66,10 @@ Section "Screen"
     Device         "Device{{item.screens.index(screen)}}"
     Monitor        "Monitor{{item.screens.index(screen)}}"
     DefaultDepth    24
-    Option         "UseDisplayDevice" "None"
     Option         "ProbeAllGpus" "false"
+{% if item.boardname == 'GRID K1' %}
+    Option         "UseDisplayDevice" "None"
+{% endif %}
     SubSection     "Display"
         Virtual     1920 1200
         Depth       24
diff --git a/roles/gpu/templates/xorg.conf.j2 b/roles/gpu/templates/xorg.conf.j2
index 2fc5f043c03e710be306d3b740cb6f5963216860..7f8b0f82076f6cfa81b34c4dd00a0d460cbe81a6 100644
--- a/roles/gpu/templates/xorg.conf.j2
+++ b/roles/gpu/templates/xorg.conf.j2
@@ -66,8 +66,10 @@ Section "Screen"
     Device         "Device{{item.screens.index(screen)}}"
     Monitor        "Monitor{{item.screens.index(screen)}}"
     DefaultDepth    24
-    Option         "UseDisplayDevice" "None"
     Option         "ProbeAllGpus" "false"
+{% if item.boardname == 'GRID K1' %}
+    Option         "UseDisplayDevice" "None"
+{% endif %}
     SubSection     "Display"
         Virtual     1920 1200
         Depth       24