diff --git a/packages/components/src/DashboardLayout/DashboardLayout.tsx b/packages/components/src/DashboardLayout/DashboardLayout.tsx
index 2f52d703..fdca92a2 100644
--- a/packages/components/src/DashboardLayout/DashboardLayout.tsx
+++ b/packages/components/src/DashboardLayout/DashboardLayout.tsx
@@ -43,7 +43,8 @@ export function DashboardLayout({ children }: { children?: ReactNode }) {
 
   const pathname = usePathname()!
   const isSettings = pathname.includes('/~/settings')
-  const isDesign = pathname.includes('/~/design')
+  const isDesign =
+    pathname.includes('/~/design') || pathname.includes('/~/database')
 
   if (
     domainsQuery.isLoading ||
diff --git a/packages/components/src/database-ui/views/TableView/hooks/useTableView/useTableView.tsx b/packages/components/src/database-ui/views/TableView/hooks/useTableView/useTableView.tsx
index 373259bc..5652d034 100644
--- a/packages/components/src/database-ui/views/TableView/hooks/useTableView/useTableView.tsx
+++ b/packages/components/src/database-ui/views/TableView/hooks/useTableView/useTableView.tsx
@@ -13,7 +13,6 @@ import {
 } from '@glideapps/glide-data-grid'
 import { format } from 'date-fns'
 import { produce } from 'immer'
-import { revalidateTag } from 'next/cache'
 import { useDatabaseContext } from '@penx/components/database-ui'
 import { DateCell } from '@penx/components/date-cell'
 import { FileCell } from '@penx/components/file-cell'
diff --git a/packages/hooks/src/useDatabases.ts b/packages/hooks/src/useDatabases.ts
index 80a15f5e..5d165361 100644
--- a/packages/hooks/src/useDatabases.ts
+++ b/packages/hooks/src/useDatabases.ts
@@ -1,9 +1,10 @@
 import isEqual from 'react-fast-compare'
-import { Database } from '@penx/db/client'
 import { useQuery } from '@tanstack/react-query'
 import { useSiteContext } from '@penx/contexts/SiteContext'
+import { Database } from '@penx/db/client'
 import { localDB } from '@penx/local-db'
 import { queryClient } from '@penx/query-client'
+import { useSession } from '@penx/session'
 import { api } from '@penx/trpc-client'
 
 function equal(remoteDatabases: Database[], localDatabases: any[]): boolean {
@@ -18,13 +19,13 @@ function equal(remoteDatabases: Database[], localDatabases: any[]): boolean {
 }
 
 export function useDatabases() {
-  const site = useSiteContext()
+  const { session } = useSession()
+  const siteId = session?.siteId!
   return useQuery({
+    enabled: !!siteId,
     queryKey: ['databases'],
     queryFn: async () => {
-      const databases = await localDB.database
-        .where({ siteId: site.id })
-        .toArray()
+      const databases = await localDB.database.where({ siteId }).toArray()
       const localDatabases = databases.sort((a, b) => {
         const updatedAtDiff = b.updatedAt.getTime() - a.updatedAt.getTime()
         if (updatedAtDiff === 0) {
@@ -36,7 +37,7 @@ export function useDatabases() {
 
       setTimeout(async () => {
         const remoteDatabases = await api.database.list.query({
-          siteId: site.id,
+          siteId,
         })
         const isEqual = equal(remoteDatabases, localDatabases)