diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts b/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts
new file mode 100644
index 000000000000..587cb172eeab
--- /dev/null
+++ b/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import datemath from '@elastic/datemath';
+import moment from 'moment-timezone';
+import * as helpers from './helpers';
+
+describe('url_params_context helpers', () => {
+  describe('getParsedDate', () => {
+    describe('given undefined', () => {
+      it('returns undefined', () => {
+        expect(helpers.getParsedDate(undefined)).toBeUndefined();
+      });
+    });
+
+    describe('given a parsable date', () => {
+      it('returns the parsed date', () => {
+        expect(helpers.getParsedDate('1970-01-01T00:00:00.000Z')).toEqual(
+          '1970-01-01T00:00:00.000Z'
+        );
+      });
+    });
+
+    describe('given a non-parsable date', () => {
+      it('returns null', () => {
+        expect(helpers.getParsedDate('nope')).toEqual(null);
+      });
+    });
+  });
+
+  describe('getDateRange', () => {
+    describe('when rangeFrom and rangeTo are not changed', () => {
+      it('returns the previous state', () => {
+        expect(
+          helpers.getDateRange({
+            state: {
+              rangeFrom: 'now-1m',
+              rangeTo: 'now',
+              start: '1970-01-01T00:00:00.000Z',
+              end: '1971-01-01T00:00:00.000Z',
+            },
+            rangeFrom: 'now-1m',
+            rangeTo: 'now',
+          })
+        ).toEqual({
+          start: '1970-01-01T00:00:00.000Z',
+          end: '1971-01-01T00:00:00.000Z',
+        });
+      });
+    });
+
+    describe('when rangeFrom or rangeTo have changed', () => {
+      it('returns new state', () => {
+        jest.spyOn(datemath, 'parse').mockReturnValue(moment(0).utc());
+
+        expect(
+          helpers.getDateRange({
+            state: {
+              rangeFrom: 'now-1m',
+              rangeTo: 'now',
+              start: '1972-01-01T00:00:00.000Z',
+              end: '1973-01-01T00:00:00.000Z',
+            },
+            rangeFrom: 'now-2m',
+            rangeTo: 'now',
+          })
+        ).toEqual({
+          start: '1970-01-01T00:00:00.000Z',
+          end: '1970-01-01T00:00:00.000Z',
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.ts b/x-pack/plugins/apm/public/context/url_params_context/helpers.ts
index 45db4dcc94cc..bff2ef5deb86 100644
--- a/x-pack/plugins/apm/public/context/url_params_context/helpers.ts
+++ b/x-pack/plugins/apm/public/context/url_params_context/helpers.ts
@@ -17,18 +17,23 @@ export function getParsedDate(rawDate?: string, opts = {}) {
   }
 }
 
-export function getStart(prevState: IUrlParams, rangeFrom?: string) {
-  if (prevState.rangeFrom !== rangeFrom) {
-    return getParsedDate(rangeFrom);
+export function getDateRange({
+  state,
+  rangeFrom,
+  rangeTo,
+}: {
+  state: IUrlParams;
+  rangeFrom?: string;
+  rangeTo?: string;
+}) {
+  if (state.rangeFrom === rangeFrom && state.rangeTo === rangeTo) {
+    return { start: state.start, end: state.end };
   }
-  return prevState.start;
-}
 
-export function getEnd(prevState: IUrlParams, rangeTo?: string) {
-  if (prevState.rangeTo !== rangeTo) {
-    return getParsedDate(rangeTo, { roundUp: true });
-  }
-  return prevState.end;
+  return {
+    start: getParsedDate(rangeFrom),
+    end: getParsedDate(rangeTo, { roundUp: true }),
+  };
 }
 
 export function toNumber(value?: string) {
diff --git a/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts b/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts
index 6d9f982f9275..0596d649116a 100644
--- a/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts
+++ b/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts
@@ -11,8 +11,7 @@ import { pickKeys } from '../../../common/utils/pick_keys';
 import { localUIFilterNames } from '../../../server/lib/ui_filters/local_ui_filters/config';
 import { toQuery } from '../../components/shared/Links/url_helpers';
 import {
-  getEnd,
-  getStart,
+  getDateRange,
   removeUndefinedProps,
   toBoolean,
   toNumber,
@@ -56,8 +55,7 @@ export function resolveUrlParams(location: Location, state: TimeUrlParams) {
 
   return removeUndefinedProps({
     // date params
-    start: getStart(state, rangeFrom),
-    end: getEnd(state, rangeTo),
+    ...getDateRange({ state, rangeFrom, rangeTo }),
     rangeFrom,
     rangeTo,
     refreshPaused: refreshPaused ? toBoolean(refreshPaused) : undefined,