diff --git a/xrdpdev/xorg.conf b/xrdpdev/xorg.conf
index 24a7b056..e4de3348 100644
--- a/xrdpdev/xorg.conf
+++ b/xrdpdev/xorg.conf
@@ -12,6 +12,7 @@ Section "ServerFlags"
     Option "DefaultServerLayout" "X11 Server"
     Option "DontVTSwitch" "on"
     Option "AutoAddDevices" "off"
+    Option "AutoAddGPU" "off"
 EndSection
 
 Section "Module"
@@ -57,6 +58,8 @@ EndSection
 Section "Screen"
     Identifier "Screen (xrdpdev)"
     Device "Video Card (xrdpdev)"
+    # Comment out this line for xorg < 1.18.0
+    GPUDevice ""
     Monitor "Monitor"
     DefaultDepth 24
     SubSection "Display"