diff --git a/apps/desktop/src/platform/services/ssh-agent.service.ts b/apps/desktop/src/platform/services/ssh-agent.service.ts
index 726d28022e5..d4c7c5f460e 100644
--- a/apps/desktop/src/platform/services/ssh-agent.service.ts
+++ b/apps/desktop/src/platform/services/ssh-agent.service.ts
@@ -83,6 +83,15 @@ export class SshAgentService implements OnDestroy {
     this.messageListener
       .messages$(new CommandDefinition("sshagent.signrequest"))
       .pipe(
+        withLatestFrom(this.desktopSettingsService.sshAgentEnabled$),
+        concatMap(async ([message, enabled]) => {
+          if (!enabled) {
+            await ipc.platform.sshAgent.signRequestResponse(message.requestId as number, false);
+          }
+          return { message, enabled };
+        }),
+        filter(({ enabled }) => enabled),
+        map(({ message }) => message),
         withLatestFrom(this.authService.activeAccountStatus$),
         // This switchMap handles unlocking the vault if it is locked:
         //   - If the vault is locked, we will wait for it to be unlocked.