diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
index da4262376d..2573abc50b 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js
@@ -73,15 +73,23 @@ const DeliveryDatePicker = ({ filters, setFilters, isApplied, setIsApplied }) =>
     setIsCalendarOpen(false);
   };
 
-  const setDate = (date) => {
-    setFilters((prevfilters) => ({ ...prevfilters, deliveryDate: date }));
-  };
   const setDeliveryFrom = (date) => {
     setFilters((prevfilters) => ({ ...prevfilters, deliveryFrom: date }));
   };
   const setDeliveryTo = (date) => {
     setFilters((prevfilters) => ({ ...prevfilters, deliveryTo: date }));
   };
+  const onDateSet = (date) => {
+    setIsApplied(false);
+    setIsTimeOpen(false);
+    setIsCalendarOpen(false);
+    setFilters((prevFilters) => ({
+      ...prevFilters,
+      deliveryDate: date,
+      deliveryFrom: moment().startOf("day"),
+      deliveryTo: moment().endOf("day"),
+    }));
+  };
 
   const toggleCalendar = () => setIsCalendarOpen((prevIsCalendarOpen) => !prevIsCalendarOpen);
 
@@ -93,17 +101,10 @@ const DeliveryDatePicker = ({ filters, setFilters, isApplied, setIsApplied }) =>
 
   const showTimePicker = () => setIsTimeOpen(true);
 
-  const onDateSet = (date) => {
-    setIsApplied(false);
-    setIsTimeOpen(false);
-    setIsCalendarOpen(false);
-    setDate(date);
-  };
-
   const CalendarElement = () => (
     <StyledCalendar
       selectedDate={filters.deliveryDate}
-      setSelectedDate={setDate}
+      setSelectedDate={onDateSet}
       onChange={closeCalendar}
       isMobile={isMobileOnly}
       forwardedRef={calendarRef}
@@ -162,6 +163,7 @@ const DeliveryDatePicker = ({ filters, setFilters, isApplied, setIsApplied }) =>
             date={filters.deliveryDate}
             onChange={onDateSet}
             selectedDateText={t("SelectDate")}
+            showCalendarIcon={false}
           />
         )}
         {filters.deliveryDate !== null &&