diff --git a/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf b/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf
index 1583296..e952914 100644
--- a/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf
+++ b/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf
@@ -4,19 +4,8 @@ Section "Device"
     Option      "fbdev" "/dev/fb0"
 EndSection
 
-Section "Monitor"
-    Identifier  "monitor0"
-    Modeline    "1920x1080" 148.50 1920 2008 2052 2200 1080 1084 1089 1125 +hsync +vsync
-    Option      "PreferredMode" "1920x1080"
-EndSection
-
 Section "Screen"
     Identifier  "screen0"
     Device      "fbdev"
-    Monitor     "monitor0"
     DefaultDepth 24
-    SubSection "Display"
-        Depth   24
-        Modes   "1920x1080" "1280x1024" "1024x768"
-    EndSubSection
 EndSection
diff --git a/iso/overlay/etc/systemd/system/lightdm.service.d/bee-limits.conf b/iso/overlay/etc/systemd/system/lightdm.service.d/bee-limits.conf
new file mode 100644
index 0000000..42486e7
--- /dev/null
+++ b/iso/overlay/etc/systemd/system/lightdm.service.d/bee-limits.conf
@@ -0,0 +1,6 @@
+[Service]
+# On server hardware without a usable framebuffer X may fail to start.
+# Limit restarts so the console is not flooded on headless deployments.
+RestartSec=10
+StartLimitIntervalSec=60
+StartLimitBurst=3