diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 43cf75b58..9ea85829e 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -189,6 +189,7 @@ export function matchContentToUrl(map, location) {
     const id = match?.params?.id
     switch (root) {
       case 'route':
+        dispatch(setViewedStop(null))
         if (id) {
           await dispatch(findRoutesIfNeeded())
           dispatch(findRouteIfNeeded({ routeId: id }))
@@ -223,6 +224,7 @@ export function matchContentToUrl(map, location) {
         }
         break
       case 'trip':
+        dispatch(setViewedStop(null))
         if (id) {
           dispatch(setViewedTrip({ tripId: id }))
           dispatch(setMainPanelContent(MainPanelContent.TRIP_VIEWER))