diff --git a/src/app/api/links/[linkId]/route.ts b/src/app/api/links/[linkId]/route.ts
index 512f39c96..cd93b9c64 100644
--- a/src/app/api/links/[linkId]/route.ts
+++ b/src/app/api/links/[linkId]/route.ts
@@ -24,9 +24,9 @@ export async function GET(request: Request, { params }: { params: Promise<{ link
 
 export async function POST(request: Request, { params }: { params: Promise<{ linkId: string }> }) {
   const schema = z.object({
-    name: z.string().optional(),
-    url: z.string().optional(),
-    slug: z.string().min(8).optional(),
+    name: z.string(),
+    url: z.string(),
+    slug: z.string(),
   });
 
   const { auth, body, error } = await parseRequest(request, schema);
diff --git a/src/app/api/pixels/[pixelId]/route.ts b/src/app/api/pixels/[pixelId]/route.ts
index 2f547c04f..0788579f1 100644
--- a/src/app/api/pixels/[pixelId]/route.ts
+++ b/src/app/api/pixels/[pixelId]/route.ts
@@ -24,8 +24,8 @@ export async function GET(request: Request, { params }: { params: Promise<{ pixe
 
 export async function POST(request: Request, { params }: { params: Promise<{ pixelId: string }> }) {
   const schema = z.object({
-    name: z.string().optional(),
-    slug: z.string().min(8).optional(),
+    name: z.string(),
+    slug: z.string().min(8),
   });
 
   const { auth, body, error } = await parseRequest(request, schema);
diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.ts
index f5e00c8aa..3e5699889 100644
--- a/src/app/api/send/route.ts
+++ b/src/app/api/send/route.ts
@@ -82,8 +82,6 @@ export async function POST(request: Request) {
       id,
     } = payload;
 
-    const sourceId = websiteId || pixelId || linkId;
-
     // Cache check
     let cache: Cache | null = null;
 
@@ -130,13 +128,13 @@ export async function POST(request: Request) {
     const sessionSalt = hash(startOfMonth(createdAt).toUTCString());
     const visitSalt = hash(startOfHour(createdAt).toUTCString());
 
-    const sessionId = id ? uuid(sourceId, id) : uuid(sourceId, ip, userAgent, sessionSalt);
+    const sessionId = id ? uuid(websiteId, id) : uuid(websiteId, ip, userAgent, sessionSalt);
 
     // Create a session if not found
     if (!clickhouse.enabled && !cache?.sessionId) {
       await createSession({
         id: sessionId,
-        websiteId: sourceId,
+        websiteId,
         browser,
         os,
         device,
@@ -208,7 +206,7 @@ export async function POST(request: Request) {
             : EVENT_TYPE.pageView;
 
       await saveEvent({
-        websiteId: sourceId,
+        websiteId: websiteId || linkId || pixelId,
         sessionId,
         visitId,
         eventType,
@@ -272,9 +270,6 @@ export async function POST(request: Request) {
   } catch (e) {
     const error = serializeError(e);
 
-    // eslint-disable-next-line no-console
-    console.log(error);
-
     return serverError({ errorObject: error });
   }
 }