diff --git a/src/components/pages/closing/ClosingsTable.tsx b/src/components/pages/closing/ClosingsTable.tsx
index fc5984b5..7885c75c 100644
--- a/src/components/pages/closing/ClosingsTable.tsx
+++ b/src/components/pages/closing/ClosingsTable.tsx
@@ -159,6 +159,7 @@ const ClosingsTable = () => {
     onReset: () => {
       updateFilter('location_id', '');
       updateFilter('project_status', '');
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/production/uniformity/UniformityTable.tsx b/src/components/pages/production/uniformity/UniformityTable.tsx
index 615e4941..c420ec6c 100644
--- a/src/components/pages/production/uniformity/UniformityTable.tsx
+++ b/src/components/pages/production/uniformity/UniformityTable.tsx
@@ -493,6 +493,7 @@ const UniformityTable = () => {
     updateFilter('kandang_id', '');
 
     filterFormik.resetForm();
+    filterModal.closeModal();
   }, [filterFormik, updateFilter]);
 
   const selectedRowIds = useMemo(() => {
diff --git a/src/components/pages/report/expense/tab/ReportExpenseTab.tsx b/src/components/pages/report/expense/tab/ReportExpenseTab.tsx
index b9296f89..971536c5 100644
--- a/src/components/pages/report/expense/tab/ReportExpenseTab.tsx
+++ b/src/components/pages/report/expense/tab/ReportExpenseTab.tsx
@@ -15,7 +15,7 @@ import {
 import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge';
 import RealizationStatusBadge from '@/components/pages/expense/RealizationStatusBadge';
 import Table from '@/components/Table';
-import { cn, formatCurrency, formatDate } from '@/lib/helper';
+import { formatCurrency, formatDate } from '@/lib/helper';
 import { ReportExpense } from '@/types/api/report/report-expense';
 import { ReportExpenseApi } from '@/services/api/report';
 import { isResponseSuccess } from '@/lib/api-helper';
@@ -145,6 +145,7 @@ const ReportExpenseTab = ({ tabId }: ReportExpenseTabProps) => {
       setFilterParams({});
       setIsSubmitted(false);
       setPage(1);
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
index 2e4051ce..26577109 100644
--- a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
+++ b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
@@ -119,6 +119,7 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
         toast.dismiss();
         setDateErrorShown(false);
       }
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/finance/tab/DebtSupplierTab.tsx b/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
index d5341854..fb02e959 100644
--- a/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
+++ b/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
@@ -142,6 +142,7 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
         filter_by: undefined,
       });
       setIsSubmitted(false);
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx b/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
index 5eaa67e1..afcae9a4 100644
--- a/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
+++ b/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
@@ -147,6 +147,7 @@ const PurchasesPerSupplierTab = ({ tabId }: PurchasesPerSupplierTabProps) => {
         toast.dismiss();
         setDateErrorShown(false);
       }
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx b/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
index 0f68d3b0..0be358d8 100644
--- a/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
+++ b/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
@@ -142,6 +142,7 @@ const DailyMarketingTab = ({ tabId }: DailyMarketingTabProps) => {
     onReset: () => {
       setFilterParams({});
       setIsSubmitted(false);
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
index 953b4a88..80d9da2e 100644
--- a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
+++ b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
@@ -137,6 +137,7 @@ const HppPerKandangTab = ({ tabId }: HppPerKandangTabProps) => {
         toast.dismiss();
         setDateErrorShown(false);
       }
+      filterModal.closeModal();
     },
   });
 
diff --git a/src/components/pages/report/production-result/tab/ProductionResultProjectFlockKandangTab.tsx b/src/components/pages/report/production-result/tab/ProductionResultProjectFlockKandangTab.tsx
index 20dddff1..9e844ad3 100644
--- a/src/components/pages/report/production-result/tab/ProductionResultProjectFlockKandangTab.tsx
+++ b/src/components/pages/report/production-result/tab/ProductionResultProjectFlockKandangTab.tsx
@@ -238,6 +238,7 @@ const ProductionResultContent = ({ tabId }: ProductionResultTabProps) => {
       setFilterParams({});
       setIsSubmitted(false);
       setPage(1);
+      filterModal.closeModal();
     },
   });