diff --git a/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/CalendarTab.tsx b/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/CalendarTab.tsx
index 833774c648..fe8d369fe5 100644
--- a/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/CalendarTab.tsx
+++ b/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/CalendarTab.tsx
@@ -17,7 +17,7 @@
  */
 import { useEffect, useState } from 'react';
 import Calendar from '@uikit/Calendar/Calendar';
-import { endOfDay, isBefore, startOfDay } from '@utils/date/calendarUtils';
+import { endOfDay, getToday, isBefore, startOfDay } from '@utils/date/calendarUtils';
 import TabActions from './TabActions';
 import ts from './Tabs.module.scss';
 import FormField from '@uikit/FormField/FormField';
@@ -32,8 +32,8 @@ interface CalendarTabProps {
 
 const CalendarTab = ({ rangeFrom, rangeTo, onApply, onRevert }: CalendarTabProps) => {
   const [localDate, setLocalDate] = useState<Date | undefined>(undefined);
-  const [localRangeFrom, setLocalRangeFrom] = useState<Date | undefined>(rangeFrom);
-  const [localRangeTo, setLocalRangeTo] = useState<Date | undefined>(rangeTo);
+  const [localRangeFrom, setLocalRangeFrom] = useState<Date | undefined>(() => rangeFrom ?? startOfDay(getToday()));
+  const [localRangeTo, setLocalRangeTo] = useState<Date | undefined>(() => rangeTo ?? endOfDay(getToday()));
 
   useEffect(() => {
     if (localRangeFrom && localRangeTo) {
diff --git a/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/RangesTab.tsx b/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/RangesTab.tsx
index 9fe8989a12..0a50aadb60 100644
--- a/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/RangesTab.tsx
+++ b/smart-frontend/app/src/components/uikit/DateRangePicker/Tabs/RangesTab.tsx
@@ -33,14 +33,14 @@ interface RangesTabProps {
 }
 
 const RangesTab = ({ range, onApply, onRevert, rangesPreset }: RangesTabProps) => {
-  const [selectedRangeId, setSelectedRangeId] = useState<DynamicDateRange | undefined>(range);
+  const [selectedRangeId, setSelectedRangeId] = useState<DynamicDateRange>(range ?? rangesPreset[0].id);
 
   const handleClick = (item: RangePreset) => {
     setSelectedRangeId(item.id);
   };
 
   const handleApply = () => {
-    selectedRangeId && onApply(selectedRangeId);
+    onApply(selectedRangeId);
   };
 
   return (
@@ -61,10 +61,10 @@ const RangesTab = ({ range, onApply, onRevert, rangesPreset }: RangesTabProps) =
       <div className={ts.dateRangePickerTab__right}>
         <div className={ts.dateRangePickerTab__rightInputs}>
           <FormField label="From">
-            <Input size="small" value={selectedRangeId ?? ''} readOnly />
+            <Input size="small" value={selectedRangeId} readOnly />
           </FormField>
           <FormField label="To">
-            <Input size="small" value={selectedRangeId ? 'now' : ''} readOnly disabled={!!selectedRangeId} />
+            <Input size="small" value="now" readOnly />
           </FormField>
         </div>
         <TabActions onApply={handleApply} onRevert={onRevert} />