diff --git a/src/app.d.ts b/src/app.d.ts
index b1bfd97..e132525 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -10,10 +10,10 @@ declare global {
 			errorId: string;
 		}
 		interface Locals {
-			user: User | null;
+			user?: User;
 		}
 		interface PageData {
-			user: User | null;
+			user?: User;
 		}
 		// interface Platform {}
 	}
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 8814496..9bb6600 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -9,7 +9,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 	const session = event.cookies.get('session');
 
 	if (!session) {
-		event.locals.user = null;
+		event.locals.user = undefined;
 		return resolve(event);
 	}
 
@@ -20,7 +20,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 	});
 
 	if (!res.ok) {
-		event.locals.user = null;
+		event.locals.user = undefined;
 		event.cookies.delete('session', { path: '/' });
 		return resolve(event);
 	}
@@ -41,7 +41,7 @@ export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookie
 
 	request = new Request(request, {
 		headers: {
-			...request.headers,
+			...Object.fromEntries(request.headers),
 			Authorization: `Bearer ${session}`
 		},
 	});