diff --git a/dashboards-observability/common/utils/query_utils.ts b/dashboards-observability/common/utils/query_utils.ts
index 8a92cc8b2..985964d7b 100644
--- a/dashboards-observability/common/utils/query_utils.ts
+++ b/dashboards-observability/common/utils/query_utils.ts
@@ -40,7 +40,7 @@ export const preprocessQuery = ({
 
   // convert to moment
   const start = datemath.parse(startTime)?.utc().format(DATE_PICKER_FORMAT);
-  const end = datemath.parse(endTime)?.utc().format(DATE_PICKER_FORMAT);
+  const end = datemath.parse(endTime, { roundUp: true })?.utc().format(DATE_PICKER_FORMAT);
   const tokens = rawQuery.replaceAll(PPL_NEWLINE_REGEX, '').match(PPL_INDEX_INSERT_POINT_REGEX);
 
   if (isEmpty(tokens)) return finalQuery;
diff --git a/dashboards-observability/public/components/common/search/date_picker.tsx b/dashboards-observability/public/components/common/search/date_picker.tsx
index ecc1ade76..2d3ec8b19 100644
--- a/dashboards-observability/public/components/common/search/date_picker.tsx
+++ b/dashboards-observability/public/components/common/search/date_picker.tsx
@@ -4,31 +4,14 @@
  */
 
 import React from 'react';
-import {
-  EuiFlexItem,
-  EuiSuperDatePicker
-} from '@elastic/eui';
-import {
-  IDatePickerProps
-} from './search';
+import { EuiSuperDatePicker } from '@elastic/eui';
+import { IDatePickerProps } from './search';
 import { uiSettingsService } from '../../../../common/utils';
 
 export function DatePicker(props: IDatePickerProps) {
+  const { startTime, endTime, handleTimePickerChange, handleTimeRangePickerRefresh } = props;
 
-  const {
-    startTime,
-    endTime,
-    setStartTime,
-    setEndTime,
-    handleTimePickerChange,
-    handleTimeRangePickerRefresh
-  } = props;
-
-  const handleTimeChange = (e) => {
-    const start = e.start;
-    const end = e.start === e.end ? 'now' : e.end;
-    handleTimePickerChange([start, end]);
-  };
+  const handleTimeChange = (e) => handleTimePickerChange([e.start, e.end]);
 
   return (
     <EuiSuperDatePicker
@@ -41,4 +24,4 @@ export function DatePicker(props: IDatePickerProps) {
       className="osdQueryBar__datePicker"
     />
   );
-}
\ No newline at end of file
+}