diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.ts
index 7eb364a1..2d6a58cc 100644
--- a/pages/api/websites/[id]/metrics.ts
+++ b/pages/api/websites/[id]/metrics.ts
@@ -144,8 +144,8 @@ export default async (
         startDate,
         endDate,
         column,
-        table,
         filters,
+        type,
       });
 
       return ok(res, data);
diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.ts
index 582eb006..08221396 100644
--- a/queries/analytics/pageview/getPageviewMetrics.ts
+++ b/queries/analytics/pageview/getPageviewMetrics.ts
@@ -12,8 +12,8 @@ export async function getPageviewMetrics(
       startDate: Date;
       endDate: Date;
       column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
-      table: string;
       filters: object;
+      type: string;
     },
   ]
 ) {
@@ -30,16 +30,17 @@ async function relationalQuery(
     endDate: Date;
     column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
     filters: object;
+    type: string;
   },
 ) {
-  const { startDate, endDate, column, filters = {} } = data;
+  const { startDate, endDate, column, filters = {}, type } = data;
   const { rawQuery, parseFilters, toUuid } = prisma;
-  const params: any = {
+  const params: any = [
     websiteId,
     startDate,
     endDate,
-    type: EVENT_TYPE.pageView,
-  };
+    type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
+  ];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
@@ -63,15 +64,16 @@ async function clickhouseQuery(
     endDate: Date;
     column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
     filters: object;
+    type: string;
   },
 ) {
-  const { startDate, endDate, column, filters = {} } = data;
+  const { startDate, endDate, column, filters = {}, type } = data;
   const { rawQuery, parseFilters, getBetweenDates } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
   const params = {
     websiteId,
     revId: website?.revId || 0,
-    eventType: EVENT_TYPE.pageView,
+    eventType: type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   };
   const { filterQuery } = parseFilters(filters, params);