diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 66e17dfbe..ac9c2e8dd 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -30,7 +30,7 @@ export const FILTER_DAY = 'filter-day';
 export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
-export const UNIT_TYPES = ['year', 'month', 'hour', 'day'];
+export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
 export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index c09d262a1..5218af10f 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -2,7 +2,7 @@ import * as yup from 'yup';
 
 export const dateRange = {
   startAt: yup.number().integer().required(),
-  endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+  endAt: yup.number().integer().min(yup.ref('startAt')).required(),
 };
 
 export const pageInfo = {
diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/event-data/events.ts
index 19f0c8f16..bf0f409a6 100644
--- a/src/pages/api/event-data/events.ts
+++ b/src/pages/api/event-data/events.ts
@@ -17,7 +17,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     event: yup.string(),
   }),
 };
diff --git a/src/pages/api/event-data/fields.ts b/src/pages/api/event-data/fields.ts
index b2af75111..4353ee730 100644
--- a/src/pages/api/event-data/fields.ts
+++ b/src/pages/api/event-data/fields.ts
@@ -17,7 +17,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     field: yup.string(),
   }),
 };
diff --git a/src/pages/api/event-data/stats.ts b/src/pages/api/event-data/stats.ts
index a2f9a1135..7e440b88d 100644
--- a/src/pages/api/event-data/stats.ts
+++ b/src/pages/api/event-data/stats.ts
@@ -16,7 +16,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
   }),
 };
 
diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 72b33e3eb..806b4128c 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -26,7 +26,7 @@ const schema = {
   GET: yup.object().shape({
     id: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref<number>('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref<number>('startAt')).required(),
   }),
 };
 
diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events.ts
index d07fd28f9..311320767 100644
--- a/src/pages/api/websites/[websiteId]/events.ts
+++ b/src/pages/api/websites/[websiteId]/events.ts
@@ -21,7 +21,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     unit: UnitTypeTest,
     timezone: TimezoneTest,
     url: yup.string(),