diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts
index edfae97..c04ff34 100644
--- a/src/app/api/auth/register/route.ts
+++ b/src/app/api/auth/register/route.ts
@@ -23,6 +23,14 @@ export async function POST(request: Request) {
       );
     }
 
+    const existingUser = await prisma.user.findUnique({
+      where: { email },
+    });
+
+    if (existingUser) {
+      return NextResponse.json({ error: "Dieser Nutzer existiert bereits." }, { status: 409 });
+    }
+
     const supabase = await createClient();
 
     const { data, error } = await supabase.auth.signUp({
@@ -47,15 +55,6 @@ export async function POST(request: Request) {
       return NextResponse.json({ error: "User konnte nicht erstellt werden" }, { status: 500 });
     }
 
-    // Check if User exists in the DB
-    const existingUser = await prisma.user.findUnique({
-      where: { email },
-    });
-
-    if (existingUser) {
-      return NextResponse.json({ user: existingUser }, { status: 200 });
-    }
-
     const newUser = await prisma.user.create({
       data: {
         id: supabaseUser.id,