diff --git a/apps/nextjs/src/components/user-avatar-menu.tsx b/apps/nextjs/src/components/user-avatar-menu.tsx
index 0cd5e0726..a9f47d9ab 100644
--- a/apps/nextjs/src/components/user-avatar-menu.tsx
+++ b/apps/nextjs/src/components/user-avatar-menu.tsx
@@ -72,7 +72,7 @@ export const UserAvatarMenu = ({ children }: UserAvatarMenuProps) => {
           <>
             <Menu.Item
               component={Link}
-              href={`/manage/users/${session.data?.user.id}`}
+              href={`/manage/users/${session.data?.user?.id}`}
               leftSection={<IconSettings size="1rem" />}
             >
               {t("preferences")}
diff --git a/packages/auth/index.ts b/packages/auth/index.ts
index eed6a80b9..b8cbc55a1 100644
--- a/packages/auth/index.ts
+++ b/packages/auth/index.ts
@@ -1,12 +1,12 @@
-import type { DefaultSession } from "@auth/core/types";
+import type { DefaultSession } from "next-auth";
 
 import type { GroupPermissionKey } from "@homarr/definitions";
 
 import { createConfiguration } from "./configuration";
 
-export type { Session } from "@auth/core/types";
+export type { Session } from "next-auth";
 
-declare module "@auth/core/types" {
+declare module "next-auth" {
   interface Session {
     user: {
       id: string;
diff --git a/packages/auth/permissions/board-permissions.ts b/packages/auth/permissions/board-permissions.ts
index a3adbe8f6..35bac53ab 100644
--- a/packages/auth/permissions/board-permissions.ts
+++ b/packages/auth/permissions/board-permissions.ts
@@ -1,4 +1,4 @@
-import type { Session } from "@auth/core/types";
+import type { Session } from "next-auth";
 
 export type BoardPermissionsProps = (
   | {
diff --git a/packages/auth/permissions/test/board-permissions.spec.ts b/packages/auth/permissions/test/board-permissions.spec.ts
index 24b180836..05b98a039 100644
--- a/packages/auth/permissions/test/board-permissions.spec.ts
+++ b/packages/auth/permissions/test/board-permissions.spec.ts
@@ -1,4 +1,4 @@
-import type { Session } from "@auth/core/types";
+import type { Session } from "next-auth";
 import { describe, expect, test } from "vitest";
 
 import { getPermissionsWithChildren } from "@homarr/definitions";
diff --git a/packages/auth/session.ts b/packages/auth/session.ts
index 3e893db04..02ef573df 100644
--- a/packages/auth/session.ts
+++ b/packages/auth/session.ts
@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import type { Session } from "@auth/core/types";
+import type { Session } from "next-auth";
 
 import type { Database } from "@homarr/db";