diff --git a/src/codeflare_sdk/cluster/cluster.py b/src/codeflare_sdk/cluster/cluster.py
index c1358035c..6ddd778c0 100644
--- a/src/codeflare_sdk/cluster/cluster.py
+++ b/src/codeflare_sdk/cluster/cluster.py
@@ -633,20 +633,17 @@ def get_current_namespace():  # pragma: no cover
             print("Unable to find current namespace")
             return None
     else:
-        if "KUBERNETES_PORT" in os.environ:
-            if os.path.isfile(
-                "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
-            ):
-                try:
-                    file = open(
-                        "/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r"
-                    )
-                    active_context = file.readline().strip("\n")
-                    return active_context
-                except Exception as e:
-                    print(
-                        "unable to gather namespace from /var/run/secrets/kubernetes.io/serviceaccount/namespace trying to gather from current context"
-                    )
+        if os.path.isfile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"):
+            try:
+                file = open(
+                    "/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r"
+                )
+                active_context = file.readline().strip("\n")
+                return active_context
+            except Exception as e:
+                print(
+                    "unable to gather namespace from /var/run/secrets/kubernetes.io/serviceaccount/namespace trying to gather from current context"
+                )
         else:
             try:
                 _, active_context = config.list_kube_config_contexts(config_check())