diff --git a/src/components/metrics/TimeRangePickerForm.tsx b/src/components/metrics/TimeRangePickerForm.tsx
index 9a8a070a..5c6cb71b 100644
--- a/src/components/metrics/TimeRangePickerForm.tsx
+++ b/src/components/metrics/TimeRangePickerForm.tsx
@@ -28,8 +28,8 @@ export function TimeRangePickerForm({
   onClose,
 }: TimeRangePickerFormProps) {
   const [date, setDate] = useState(defaultStartDate || new Date());
-  const [startHour, setStartHour] = useState(0);
-  const [endHour, setEndHour] = useState(23);
+  const [startHour, setStartHour] = useState(defaultStartDate?.getHours() || 0);
+  const [endHour, setEndHour] = useState(defaultEndDate?.getHours() || 23);
   const { formatMessage, labels } = useMessages();
 
   const disabled = startHour > endHour;