diff --git a/assets/config/bash-kube b/assets/config/bash-kube
index 905a471..4050b43 100644
--- a/assets/config/bash-kube
+++ b/assets/config/bash-kube
@@ -5,7 +5,11 @@ KUBE_PS1_SYMBOL_ENABLE=false
 KUBE_PS1_NS_ENABLE=true
 
 function get_cluster_short() {
-  CLUSTER_NAME=$(echo $1 | awk -F / '{print $2}')
+  if [[ "${1}" =~ "/" ]]; then
+    CLUSTER_NAME=$(echo $1 | awk -F / '{print $2}')
+  else 
+    CLUSTER_NAME=$(echo $1)
+  fi
   SERVER=$(grep -A 1 -B 1 "${CLUSTER_NAME}" ~/.kube/config | grep server | sed -E "s/ *server: (.*)/\1/g")
   NEW_CLUSTER_NAMES=$(grep -A 1 -B 1 "${SERVER}" ~/.kube/config | grep name | grep -v ${CLUSTER_NAME} | sed -E "s/ *name: (.*)/\1/g")
   NEW_CLUSTER_NAME=${NEW_CLUSTER_NAMES%$'\n'*}
diff --git a/assets/config/zsh-kube b/assets/config/zsh-kube
index 829e1b6..7e5303e 100644
--- a/assets/config/zsh-kube
+++ b/assets/config/zsh-kube
@@ -5,7 +5,11 @@ KUBE_PS1_SYMBOL_ENABLE=false
 KUBE_PS1_NS_ENABLE=true
 
 function get_cluster_short() {
-  CLUSTER_NAME=$(echo $1 | awk -F / '{print $2}')
+  if [[ "${1}" =~ "/" ]]; then
+    CLUSTER_NAME=$(echo $1 | awk -F / '{print $2}')
+  else 
+    CLUSTER_NAME=$(echo $1)
+  fi
   SERVER=$(grep -A 1 -B 1 "${CLUSTER_NAME}" ~/.kube/config | grep server | sed -E "s/ *server: (.*)/\1/g")
   NEW_CLUSTER_NAMES=$(grep -A 1 -B 1 "${SERVER}" ~/.kube/config | grep name | grep -v ${CLUSTER_NAME} | sed -E "s/ *name: (.*)/\1/g")
   NEW_CLUSTER_NAME=${NEW_CLUSTER_NAMES%$'\n'*}