diff --git a/server/src/utils/logging/initLogger.ts b/server/src/utils/logging/initLogger.ts
index fc78c9094..f3194ad77 100644
--- a/server/src/utils/logging/initLogger.ts
+++ b/server/src/utils/logging/initLogger.ts
@@ -134,11 +134,7 @@ export const initLogger = () => {
 			stream: pino.transport({
 				target: "@axiomhq/pino",
 				options: {
-					dataset:
-						process.env.NODE_ENV === "test" ||
-						process.env.NODE_ENV === "development"
-							? "server-dev"
-							: "express",
+					dataset: "express",
 					token: process.env.AXIOM_TOKEN,
 				},
 			}),
diff --git a/shared/api/events/list/eventsListParams.ts b/shared/api/events/list/eventsListParams.ts
index 656946f35..e749a7853 100644
--- a/shared/api/events/list/eventsListParams.ts
+++ b/shared/api/events/list/eventsListParams.ts
@@ -4,11 +4,12 @@ import { createPaginationParamsSchema } from "../../common/pagePaginationSchemas
 export const ApiEventsListParamsSchema = createPaginationParamsSchema({
 	defaultLimit: 100,
 }).extend({
-	customer_id: z.string().describe("Filter events by customer ID"),
+	customer_id: z.string().optional().describe("Filter events by customer ID"),
 	feature_id: z
 		.string()
 		.min(1)
 		.or(z.array(z.string().min(1)))
+		.optional()
 		.describe("Filter by specific feature ID(s)"),
 
 	custom_range: z