diff --git a/app/calendar/page.tsx b/app/calendar/page.tsx
index f78d9176..651d4c30 100644
--- a/app/calendar/page.tsx
+++ b/app/calendar/page.tsx
@@ -1,12 +1,11 @@
-"use client";
-
 import { getServerSession } from "next-auth/next";
 import { authOptions } from "@/app/api/auth/[...nextauth]/route";
 import { redirect } from "next/navigation";
 import { prisma } from "@/lib/prisma";
 import { CalendarClient } from "@/components/calendar/calendar-client";
+import { Metadata } from "next";
 
-export const metadata = {
+export const metadata: Metadata = {
   title: "Enkun - Calendrier",
   description: "Gérez vos rendez-vous et événements",
 };
@@ -18,10 +17,12 @@ export default async function CalendarPage() {
     redirect("/api/auth/signin");
   }
 
+  const userId = session.user.username || session.user.email || '';
+
   // Get user's calendars
   const userCalendars = await prisma.calendar.findMany({
     where: {
-      userId: session.user.username || session.user.email,
+      userId: userId,
     },
     include: {
       events: {
@@ -43,7 +44,7 @@ export default async function CalendarPage() {
         name: "Calendrier principal",
         color: "#0082c9",
         description: "Calendrier par défaut",
-        userId: session.user.username || session.user.email,
+        userId: userId,
       },
       include: {
         events: true
@@ -63,7 +64,7 @@ export default async function CalendarPage() {
       <div className="bg-white rounded-lg shadow">
         <CalendarClient 
           initialCalendars={calendars} 
-          userId={session.user.username || session.user.email}
+          userId={userId}
         />
       </div>
     </div>
diff --git a/components/sidebar.tsx b/components/sidebar.tsx
index 1efea227..d1ee0a5d 100644
--- a/components/sidebar.tsx
+++ b/components/sidebar.tsx
@@ -74,12 +74,6 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
       href: "/diary",
       iframe: process.env.NEXT_PUBLIC_IFRAME_DIARY_URL,
     },
-    {
-      title: "Calendar",
-      icon: Calendar,
-      href: "/calendar",
-      external: false,
-    },
     {
       title: "Email",
       icon: Mail,