diff --git a/apps/builder/components/dashboard/FolderContent.tsx b/apps/builder/components/dashboard/FolderContent.tsx
index 06456d911f..2b39242f74 100644
--- a/apps/builder/components/dashboard/FolderContent.tsx
+++ b/apps/builder/components/dashboard/FolderContent.tsx
@@ -55,6 +55,7 @@ export const FolderContent = ({ folder }: Props) => {
     position: 'top-right',
     status: 'error',
   })
+
   const {
     folders,
     isLoading: isFolderLoading,
diff --git a/apps/builder/contexts/WorkspaceContext.tsx b/apps/builder/contexts/WorkspaceContext.tsx
index eec8250c94..5220c72528 100644
--- a/apps/builder/contexts/WorkspaceContext.tsx
+++ b/apps/builder/contexts/WorkspaceContext.tsx
@@ -51,7 +51,7 @@ export const WorkspaceContext = ({ children }: { children: ReactNode }) => {
   )?.role
 
   useEffect(() => {
-    if (!workspaces || workspaces.length === 0) return
+    if (!workspaces || workspaces.length === 0 || currentWorkspace) return
     const lastWorspaceId = localStorage.getItem('workspaceId')
     const defaultWorkspace = lastWorspaceId
       ? workspaces.find(byId(lastWorspaceId))
@@ -105,6 +105,7 @@ export const WorkspaceContext = ({ children }: { children: ReactNode }) => {
     mutate({
       workspaces: [...workspaces, newWorkspace],
     })
+    console.log(newWorkspace)
     setCurrentWorkspace(newWorkspace)
   }
 
diff --git a/apps/builder/pages/api/customDomains/[domain].ts b/apps/builder/pages/api/customDomains/[domain].ts
index 78a5bb5a9f..26be2c773b 100644
--- a/apps/builder/pages/api/customDomains/[domain].ts
+++ b/apps/builder/pages/api/customDomains/[domain].ts
@@ -19,7 +19,6 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       where: { name: domain },
     })
 
-    await deleteDomainOnVercel(domain)
     return res.send({ customDomains })
   }
   return methodNotAllowed(res)