diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
index 8578344798c..ac1758e2653 100644
--- a/src/aks-preview/HISTORY.rst
+++ b/src/aks-preview/HISTORY.rst
@@ -11,6 +11,7 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+* `az aks bastion`: Correctly configure `$KUBECONFIG` values for tunneling traffic into a private AKS cluster.
 
 19.0.0b16
 +++++++
diff --git a/src/aks-preview/azext_aks_preview/bastion/bastion.py b/src/aks-preview/azext_aks_preview/bastion/bastion.py
index b7b7838b0ba..1bd938f980a 100644
--- a/src/aks-preview/azext_aks_preview/bastion/bastion.py
+++ b/src/aks-preview/azext_aks_preview/bastion/bastion.py
@@ -186,8 +186,13 @@ def aks_bastion_set_kubeconfig(kubeconfig_path, port):
     with open(kubeconfig_path, "r") as f:
         data = yaml.load(f, Loader=yaml.SafeLoader)
     current_context = data["current-context"]
+    current_cluster = ""
+    for context in data["contexts"]:
+        if context["name"] == current_context:
+            current_cluster = context["context"]["cluster"]
+
     for cluster in data["clusters"]:
-        if cluster["name"] == current_context:
+        if cluster["name"] == current_cluster:
             server = cluster["cluster"]["server"]
             hostname = urlparse(server).hostname
             # update the server URL to point to the local port