diff --git a/app/component/map/ItineraryLine.js b/app/component/map/ItineraryLine.js
index 53f1fe3b3f..a3dad59541 100644
--- a/app/component/map/ItineraryLine.js
+++ b/app/component/map/ItineraryLine.js
@@ -49,7 +49,6 @@ class ItineraryLine extends React.Component {
     }
 
     const objs = [];
-
     this.props.legs.forEach((leg, i) => {
       if (leg.mode === 'WAIT') {
         return;
@@ -82,17 +81,19 @@ class ItineraryLine extends React.Component {
           this.props.showIntermediateStops &&
           leg.intermediatePlaces != null
         ) {
-          leg.intermediatePlaces.forEach(place =>
-            objs.push(
-              <StopMarker
-                disableModeIcons
-                stop={place.stop}
-                key={`intermediate-${place.stop.gtfsId}`}
-                mode={modePlusClass}
-                thin
-              />,
-            ),
-          );
+          leg.intermediatePlaces
+            .filter(place => place.stop)
+            .forEach(place =>
+              objs.push(
+                <StopMarker
+                  disableModeIcons
+                  stop={place.stop}
+                  key={`intermediate-${place.stop.gtfsId}`}
+                  mode={modePlusClass}
+                  thin
+                />,
+              ),
+            );
         }
 
         if (leg.from.vertexType === 'BIKESHARE') {
diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js
index 1b4b5ea820..9e43538613 100644
--- a/app/configurations/config.matka.js
+++ b/app/configurations/config.matka.js
@@ -38,7 +38,26 @@ export default {
 
   favicon: './app/configurations/images/hsl/icon_favicon-matkafi.svg',
 
-  feedIds: ['MATKA', 'HSL', 'tampere', 'LINKKI', 'lautta', 'OULU'],
+  feedIds: [
+    'MATKA',
+    'HSL',
+    'tampere',
+    'LINKKI',
+    'lautta',
+    'OULU',
+    'MatkahuoltoKainuu',
+    'MatkahuoltoSavo',
+    'MatkahuoltoKanta',
+    'MatkahuoltoKarjala',
+    'MatkahuoltoKeski',
+    'MatkahuoltoKyme',
+    'MatkahuoltoLappi',
+    'MatkahuoltoPohjanmaa',
+    'MatkahuoltoSatakunta',
+    'MatkahuoltoVakka',
+    'MatkahuoltoVantaa',
+    'MatkahuoltoVarsinais',
+  ],
 
   meta: {
     description: APP_DESCRIPTION,