diff --git a/frontend/providers/adminer/src/pages/api/apply.ts b/frontend/providers/adminer/src/pages/api/apply.ts
index 59f0654ca00..753750d3813 100644
--- a/frontend/providers/adminer/src/pages/api/apply.ts
+++ b/frontend/providers/adminer/src/pages/api/apply.ts
@@ -35,7 +35,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     const adminerName = 'adminer-' + kube_user.name;
-    const namespace = GetUserDefaultNameSpace(kube_user.name);
+    const namespace = kc.contexts[0]?.namespace || GetUserDefaultNameSpace(kube_user.name);
 
     let connections: string[] = [];
     try {