diff --git a/frontend/src/lib/components/DBManager.svelte b/frontend/src/lib/components/DBManager.svelte
index 3247575e3e..2c00593ead 100644
--- a/frontend/src/lib/components/DBManager.svelte
+++ b/frontend/src/lib/components/DBManager.svelte
@@ -31,7 +31,7 @@
 		dbSupportsSchemas
 	}: Props = $props()
 
-	let schemaKeys = $derived(Object.keys(dbSchema.schema))
+	let schemaKeys = $derived(Object.keys(dbSchema.schema ?? {}))
 	let search = $state('')
 	let selected: {
 		schemaKey?: undefined | string
@@ -53,7 +53,7 @@
 			return []
 		}
 		if (!selected.schemaKey) return []
-		return Object.keys(dbSchema.schema[selected.schemaKey])
+		return Object.keys(dbSchema.schema[selected.schemaKey] ?? {})
 	})
 
 	$effect(() => {
@@ -159,6 +159,7 @@
 			on:click={() => (dbTableEditorState = { open: true })}
 			wrapperClasses="mx-2 my-2 text-sm"
 			startIcon={{ icon: Plus }}
+			variant={tableKeys.length === 0 ? 'accent' : 'default'}
 		>
 			New table
 		</Button>
diff --git a/frontend/src/lib/components/DBManagerDrawer.svelte b/frontend/src/lib/components/DBManagerDrawer.svelte
index 11ab468c9b..6010cd5889 100644
--- a/frontend/src/lib/components/DBManagerDrawer.svelte
+++ b/frontend/src/lib/components/DBManagerDrawer.svelte
@@ -231,8 +231,8 @@
 										? 'public'
 										: 'dbo' in dbSchema?.schema
 											? 'dbo'
-											: Object.keys(dbSchema?.schema)?.[0]
-								]
+											: Object.keys(dbSchema?.schema ?? {})?.[0]
+								] ?? {}
 							)
 						)?.[0]}
 					/>