diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index a4d09a5de..1b44f2025 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -1354,15 +1354,6 @@ def open(self, *vargs, **kvargs):
         try:
             ts_start = datetime.datetime.now()
 
-            # we want to enable the ssh-agent if-and-only-if we are
-            # not given a password or an ssh key file.
-            # in this condition it means we want to query the agent
-            # for available ssh keys
-
-            allow_agent = bool(
-                (self._auth_password is None) and (self._ssh_private_key_file is None)
-            )
-
             # option to disable ncclient transport ssh authentication
             # using public keys look_for_keys=False
             if self._look_for_keys is None:
@@ -1379,7 +1370,6 @@ def open(self, *vargs, **kvargs):
                 password=self._auth_password,
                 hostkey_verify=False,
                 key_filename=self._ssh_private_key_file,
-                allow_agent=allow_agent,
                 look_for_keys=look_for_keys,
                 ssh_config=self._sshconf_lkup(),
                 timeout=self._conn_open_timeout,
diff --git a/lib/jnpr/junos/transport/tty_ssh.py b/lib/jnpr/junos/transport/tty_ssh.py
index a782414a4..c6e4d0f97 100644
--- a/lib/jnpr/junos/transport/tty_ssh.py
+++ b/lib/jnpr/junos/transport/tty_ssh.py
@@ -72,14 +72,6 @@ def _ssh_client_pre():
     def _tty_open(self):
         retry = self.RETRY_OPEN
 
-        # we want to enable the ssh-agent if-and-only-if we are
-        # not given a password or an ssh key file.
-        # in this condition it means we want to query the agent
-        # for available ssh keys
-        allow_agent = bool(
-            (self.cs_passwd is None) and (self.ssh_private_key_file is None)
-        )
-
         while retry > 0:
             try:
                 self._ssh_pre.connect(
@@ -88,7 +80,6 @@ def _tty_open(self):
                     username=self.cs_user,
                     password=self.cs_passwd,
                     timeout=self.timeout,
-                    allow_agent=allow_agent,
                     look_for_keys=False,
                     key_filename=self.ssh_private_key_file,
                 )