diff --git a/packages/network/openssh/system.d/sshd.service b/packages/network/openssh/system.d/sshd.service
index 95c93655de..f85c09f618 100644
--- a/packages/network/openssh/system.d/sshd.service
+++ b/packages/network/openssh/system.d/sshd.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=OpenSSH server daemon
+ConditionKernelCommandLine=|ssh
+ConditionPathExists=|/storage/.cache/services/sshd.conf
 After=syslog.target network.target
 
 [Service]
+EnvironmentFile=-/storage/.cache/services/sshd.conf
 ExecStartPre=/usr/sbin/sshd-keygen
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/sbin/sshd -D $SSH_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process