diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 39eb720c9b..5fb1cfa8f8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -304,6 +304,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
         sessionFactory = createSessionFactory();
       }
       sessionFactory.setServer(this);
+      setupSessionTimeout(sessionFactory);
       daemonAcceptor = createAcceptor();
 
       try {