diff --git a/appvm-scripts/qubes-gui-agent.service b/appvm-scripts/qubes-gui-agent.service
index e7a8db18..c3684fc8 100644
--- a/appvm-scripts/qubes-gui-agent.service
+++ b/appvm-scripts/qubes-gui-agent.service
@@ -9,6 +9,7 @@ TTYPath=/dev/tty7
 # custom PATH for X session can be set with ENV_PATH; otherwise service's PATH
 # is inherited
 #Environment=ENV_PATH=/usr/local/bin:/usr/bin:/bin
+ExecCondition=/bin/sh -c 'test "$(qubesdb-read --default=True /qubes-gui-enabled)" = "True"'
 ExecStartPre=/bin/sh -c /usr/lib/qubes/qubes-gui-agent-pre.sh
 ExecStart=/usr/bin/qubes-gui $GUI_OPTS
 # clean env