diff --git a/clearml_session/__main__.py b/clearml_session/__main__.py
index cc512d9..d429ded 100644
--- a/clearml_session/__main__.py
+++ b/clearml_session/__main__.py
@@ -765,9 +765,11 @@ def monitor_ssh_tunnel(state, task):
                     ssh_password = task_parameters.get('{}/ssh_password'.format(section)) or state.get('password', '')
                     jupyter_token = task_parameters.get('properties/jupyter_token')
 
-                remote_address = \
-                    task_parameters.get('properties/k8s-gateway-address') or \
-                    task_parameters.get('properties/external_address')
+                remote_address = task_parameters.get('properties/k8s-gateway-address')
+                if bool(state.get('public_ip')):
+                    remote_address = task_parameters.get('properties/external_address')
+                print(f"remote_address: {remote_address}")
+                    
                 internal_ssh_port = task_parameters.get('properties/internal_ssh_port')
                 jupyter_port = task_parameters.get('properties/jupyter_port')
                 ssh_port = \