diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index 0760cb50..a417a413 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -2,37 +2,40 @@ import React, { useEffect, useRef } from "react";
 
 const DateRangePicker = ({
   onRangeChange,
-  DateDifference = 7,
-  endDateMode = "yesterday", // "today" or "yesterday"
+  DateDifference = 7, 
+  endDateMode = "yesterday",
 }) => {
   const inputRef = useRef(null);
 
   useEffect(() => {
     const endDate = new Date();
     if (endDateMode === "yesterday") {
-      endDate.setDate(endDate.getDate() - 1);
+      endDate.setDate(endDate.getDate() - 1); 
     }
 
-    const startDate = new Date();
-    startDate.setDate(endDate.getDate() - DateDifference);
+    endDate.setHours(0, 0, 0, 0);
+
+    const startDate = new Date(endDate); 
+    startDate.setDate(endDate.getDate() - (DateDifference - 1));
+    startDate.setHours(0, 0, 0, 0);
 
     const fp = flatpickr(inputRef.current, {
       mode: "range",
-      dateFormat: "Y-m-d",
-      altInput: true,
-      altFormat: "d-m-Y",
-      defaultDate: [startDate, endDate],
-      static: true,
-      clickOpens: true,
+      dateFormat: "Y-m-d", 
+      altInput: true,     
+      altFormat: "d-m-Y", 
+      defaultDate: [startDate, endDate], 
+      static: true,       
+      clickOpens: true,   
       onChange: (selectedDates, dateStr) => {
-        const [startDate, endDate] = dateStr.split(" to ");
-        onRangeChange?.({ startDate, endDate });
+        const [startDateString, endDateString] = dateStr.split(" to ");
+        onRangeChange?.({ startDate: startDateString, endDate: endDateString });
       },
     });
 
     onRangeChange?.({
-      startDate: startDate.toLocaleDateString("en-CA"),
-      endDate: endDate.toLocaleDateString("en-CA"),
+      startDate: startDate.toLocaleDateString("en-CA"), 
+      endDate: endDate.toLocaleDateString("en-CA"),     
     });
 
     return () => {