diff --git a/src/components/pages/production/uniformity/UniformityTableFilter.schema.ts b/src/components/pages/production/uniformity/UniformityTableFilter.schema.ts
index 6f7c1039..3c14553c 100644
--- a/src/components/pages/production/uniformity/UniformityTableFilter.schema.ts
+++ b/src/components/pages/production/uniformity/UniformityTableFilter.schema.ts
@@ -12,7 +12,18 @@ export type UniformityTableFilterType = {
 
 export const UniformityTableFilterSchema = yup.object({
   start_date: yup.string().required('Tanggal mulai wajib diisi'),
-  end_date: yup.string().required('Tanggal akhir wajib diisi'),
+  end_date: yup
+    .string()
+    .required('Tanggal akhir wajib diisi')
+    .test(
+      'is-greater-than-start',
+      'Tanggal akhir tidak boleh masa lampau',
+      function (value) {
+        const { start_date } = this.parent;
+        if (!start_date || !value) return true;
+        return new Date(value) >= new Date(start_date);
+      }
+    ),
   location: yup
     .mixed<OptionType>()
     .required('Lokasi wajib dipilih')