diff --git a/app/component/ItineraryPage.js b/app/component/ItineraryPage.js
index e0dce7fe8b..335530ff2f 100644
--- a/app/component/ItineraryPage.js
+++ b/app/component/ItineraryPage.js
@@ -93,6 +93,8 @@ const streetHashes = [
   streetHash.bikeAndVehicle,
   streetHash.car,
   streetHash.parkAndRide,
+  streetHash.scooter,
+  streetHash.onDemandTaxi,
 ];
 const showVehiclesThresholdMinutes = 720;
 const emptyPlans = {
diff --git a/app/component/ItineraryPageUtils.js b/app/component/ItineraryPageUtils.js
index c08973536a..6a1a3d0e1b 100644
--- a/app/component/ItineraryPageUtils.js
+++ b/app/component/ItineraryPageUtils.js
@@ -19,7 +19,12 @@ import {
 import { getMapLayerOptions } from '../util/mapLayerUtils';
 import { streetHash } from '../util/path';
 
-export const noTransitHash = [streetHash.walk, streetHash.bike, streetHash.car];
+export const noTransitHash = [
+  streetHash.walk,
+  streetHash.bike,
+  streetHash.car,
+  streetHash.scooter,
+];
 
 /**
  * Returns the index of selected itinerary. Attempts to look for
diff --git a/app/component/TransitLeg.js b/app/component/TransitLeg.js
index 0de482dcf2..bad9625195 100644
--- a/app/component/TransitLeg.js
+++ b/app/component/TransitLeg.js
@@ -528,11 +528,13 @@ class TransitLeg extends React.Component {
                 <Link
                   to={
                     (alert.route &&
-                      alert.route.gtfsId &&
+                      alert.route?.gtfsId &&
+                      leg.route &&
+                      leg.trip &&
                       `/${PREFIX_ROUTES}/${leg.route.gtfsId}/${PREFIX_DISRUPTION}/${leg.trip.pattern.code}`) ||
                     (alert.stop &&
-                      alert.stop.gtfsId &&
-                      `/${PREFIX_STOPS}/${alert.stop.gtfsId}/${PREFIX_DISRUPTION}/`)
+                      alert.stop?.gtfsId &&
+                      `/${PREFIX_STOPS}/${alert.stop?.gtfsId}/${PREFIX_DISRUPTION}/`)
                   }
                   className="disruption-link"
                 >