diff --git a/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx b/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx
index b61ed4e..ca80ac0 100644
--- a/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx
+++ b/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx
@@ -41,7 +41,8 @@ export default function WorkspaceLayout({ children }: WorkspaceLayoutProps) {
   
   const params = useParams()
   const searchParams = useSearchParams()
-  const workspaceId = params.workspaceid as string
+  //const workspaceId = params.workspaceid as string
+  const workspaceId = params ? params.workspaceid : null;
 
   const {
     setChatSettings,