diff --git a/autostart/services/gpg-agent.service b/autostart/services/gpg-agent.service
index 32dc098..802e190 100644
--- a/autostart/services/gpg-agent.service
+++ b/autostart/services/gpg-agent.service
@@ -1,6 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+ConditionPathExists=%h/.var/run/features/gpg_agent
 
 [Service]
 Type=forking
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index f6da2b0..89b0d83 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -64,6 +64,10 @@ mkdir -p "${FEATURE_DIR}"
 
 [[ $MACHINE_TYPE == "laptop" ]] && touch "${FEATURE_DIR}"/matchine_is_laptop
 
+{% if user.gpg_agent %}
+touch "${FEATURE_DIR}"/gpg_agent
+{% endif %}
+
 # Make all environment variables also usable in the systemd user instancee
 systemctl --user import-environment