diff --git a/xrdpdev/xorg_nvidia_grid.conf b/xrdpdev/xorg_nvidia_grid.conf
index 6a0b30f..276580d 100644
--- a/xrdpdev/xorg_nvidia_grid.conf
+++ b/xrdpdev/xorg_nvidia_grid.conf
@@ -1,3 +1,4 @@
+
 Section "ServerLayout"
   Identifier "XRDP GPU Server"
   Screen 0 "dGPU"
@@ -11,8 +12,16 @@ Section "ServerFlags"
   Option "DefaultServerLayout" "XRDP GPU Server"
   Option "DontVTSwitch" "on"
   Option "AutoAddDevices" "off"
+  Option "AutoAddGPU" "off"
 EndSection
 
+# This section might be needed if the nvidia Xorg module is not installed
+# in the default modules directory ie /usr/lib/xorg/modules
+# example package on ubuntu xserver-xorg-video-nvidia-535
+#Section "Files"
+#    ModulePath "/usr/lib/x86_64-linux-gnu/nvidia/xorg,/usr/lib/xorg/modules"
+#EndSection
+
 Section "Module"
   Load "xorgxrdp"
 EndSection
@@ -36,7 +45,7 @@ EndSection
 Section "Device"
   Identifier "dGPU"
   Driver "nvidia"
-  Option "ConnectToAcpid" "false"
   Option "ConnectedMonitor" "DVI-D-0,DVI-D-1,DVI-D-2,DVI-D-3"
+  Option "ConnectToAcpid" "false"
   BusID "PCI:3:0:0"
 EndSection