diff --git a/backend/src/server.ts b/backend/src/server.ts
index b6cba4a..ab5ba17 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -41,13 +41,7 @@ server.register(cors, {
 });
 
 // Manual OPTIONS handler as fallback
-server.options('/*', async (request, reply) => {
-    reply.header('Access-Control-Allow-Origin', request.headers.origin || '*');
-    reply.header('Access-Control-Allow-Credentials', 'true');
-    reply.header('Access-Control-Allow-Methods', 'GET,POST,PUT,PATCH,DELETE,OPTIONS');
-    reply.header('Access-Control-Allow-Headers', 'Content-Type, Authorization');
-    return reply.send();
-});
+// Manual OPTIONS handler removed as it conflicts with @fastify/cors plugin
 server.register(prismaPlugin);
 server.register(jwt, {
     secret: process.env.JWT_SECRET || 'supersecret'