diff --git a/studio/src/components/dashboard/workspace-provider.tsx b/studio/src/components/dashboard/workspace-provider.tsx
index 63d85937d5..67123d95d2 100644
--- a/studio/src/components/dashboard/workspace-provider.tsx
+++ b/studio/src/components/dashboard/workspace-provider.tsx
@@ -33,7 +33,7 @@ export function WorkspaceProvider({ children }: React.PropsWithChildren) {
 
   // Correct namespace
   useEffect(() => {
-    if (!data || data.response?.code == EnumStatusCode.OK || !data.namespaces?.length) {
+    if (data?.response?.code !== EnumStatusCode.OK || !data?.namespaces?.length) {
       return;
     }
 
@@ -55,7 +55,7 @@ export function WorkspaceProvider({ children }: React.PropsWithChildren) {
     }
 
     setNamespaces(currentNamespaces);
-  }, [applyParams, data, namespace, namespaceParam, setStoredNamespace]);
+  }, [applyParams, data?.response?.code, data?.namespaces, namespace, namespaceParam, setStoredNamespace]);
 
   // Memoize context components
   const currentNamespace= useMemo(
diff --git a/studio/src/pages/[organizationSlug]/[namespace]/graph/[slug]/playground.tsx b/studio/src/pages/[organizationSlug]/[namespace]/graph/[slug]/playground.tsx
index dd9cd43c42..436bff7ba9 100644
--- a/studio/src/pages/[organizationSlug]/[namespace]/graph/[slug]/playground.tsx
+++ b/studio/src/pages/[organizationSlug]/[namespace]/graph/[slug]/playground.tsx
@@ -1289,7 +1289,8 @@ const PlaygroundPage: NextPageWithLayout = () => {
             query={query}
             variables={updatedVariables}
             onEditQuery={setQuery}
-            headers={headers}
+            headers={headers === PLAYGROUND_DEFAULT_HEADERS_TEMPLATE ? undefined : headers}
+            defaultHeaders={PLAYGROUND_DEFAULT_HEADERS_TEMPLATE}
             onEditHeaders={setHeaders}
             plugins={[
               explorerPlugin({