diff --git a/arkouda/core/client.py b/arkouda/core/client.py
index d9dd224c81f..1bb39ccb14e 100644
--- a/arkouda/core/client.py
+++ b/arkouda/core/client.py
@@ -939,17 +939,16 @@ def _start_tunnel(addr: str, tunnel_server: str) -> Tuple[str, object]:
     """
     from zmq import ssh
 
-    kwargs = {"addr": addr, "server": tunnel_server}
     keyfile = os.getenv("ARKOUDA_KEY_FILE")
     password = os.getenv("ARKOUDA_PASSWORD")
 
-    if keyfile:
-        kwargs["keyfile"] = keyfile
-    if password:
-        kwargs["password"] = password
-
     try:
-        return ssh.tunnel.open_tunnel(**kwargs)
+        return ssh.tunnel.open_tunnel(
+            addr=addr,
+            server=tunnel_server,
+            keyfile=keyfile,
+            password=password,
+        )
     except Exception as e:
         raise ConnectionError(e)