diff --git a/apps/desktop/src/autofill/services/ssh-agent.service.ts b/apps/desktop/src/autofill/services/ssh-agent.service.ts
index d6ae5b0ffa2..3909e76689a 100644
--- a/apps/desktop/src/autofill/services/ssh-agent.service.ts
+++ b/apps/desktop/src/autofill/services/ssh-agent.service.ts
@@ -63,9 +63,16 @@ export class SshAgentService implements OnDestroy {
   ) {}
 
   async init() {
-    if (!(await ipc.platform.sshAgent.isLoaded())) {
-      await ipc.platform.sshAgent.init();
-    }
+    this.desktopSettingsService.sshAgentEnabled$
+      .pipe(
+        concatMap(async (enabled) => {
+          if (!(await ipc.platform.sshAgent.isLoaded()) && enabled) {
+            await ipc.platform.sshAgent.init();
+          }
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     await this.initListeners();
   }