diff --git a/linux/systemd/qubes-vm@.service b/linux/systemd/qubes-vm@.service
index 0ff2255a..cb5adb1e 100644
--- a/linux/systemd/qubes-vm@.service
+++ b/linux/systemd/qubes-vm@.service
@@ -2,6 +2,7 @@
 Description=Start Qubes VM %i
 Before=systemd-user-sessions.service
 After=qubesd.service qubes-meminfo-writer-dom0.service
+ConditionKernelCommandLine=!qubes.skip_autostart
 
 [Service]
 Type=oneshot