diff --git a/src/Runtime/Runtime.php b/src/Runtime/Runtime.php
index 5c3304b..f28e03f 100644
--- a/src/Runtime/Runtime.php
+++ b/src/Runtime/Runtime.php
@@ -457,10 +457,14 @@ class Runtime
      */
     public function getSSHConfig()
     {
-        $sshConfig = $this->getEnvOption('ssh', ['flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
+        $sshConfig = $this->getEnvOption('ssh', ['port' => 22, 'flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
+
+        if ($this->getHostPort() !== null) {
+            $sshConfig['port'] = $this->getHostPort();
+        }
 
         if (!array_key_exists('port', $sshConfig)) {
-            $sshConfig['port'] = $this->getHostPort();
+            $sshConfig['port'] = '22';
         }
 
         if (!array_key_exists('flags', $sshConfig)) {
@@ -478,7 +482,7 @@ class Runtime
     public function getHostPort()
     {
         $info = explode(':', $this->getWorkingHost());
-        return isset($info[1]) ? $info[1] : '22';
+        return isset($info[1]) ? $info[1] : null;
     }
 
     /**