diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
index a1e50048ab7..88281e50e0f 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
@@ -72,6 +72,7 @@
 import net.osmand.shared.gpx.GpxHelper;
 import net.osmand.shared.gpx.GpxUtilities;
 import net.osmand.shared.gpx.RouteActivityHelper;
+import net.osmand.shared.gpx.primitives.RouteActivity;
 import net.osmand.shared.gpx.primitives.Track;
 import net.osmand.shared.gpx.primitives.TrkSegment;
 import net.osmand.shared.gpx.primitives.WptPt;
@@ -1220,8 +1221,10 @@ private void reconstructGpxTagsFromAmenityType(Amenity amenity, Map<String, Stri
 					gpxFileExtensions.put(OSM_PREFIX + "type", "route");
 					gpxFileExtensions.put(OSM_PREFIX + "route", osmValue);
 					RouteActivityHelper helper = app.getRouteActivityHelper();
-					// TODO wrong way round
-					gpxFileExtensions.put(GpxUtilities.ACTIVITY_TYPE, subType.replace(ROUTES_PREFIX, ""));
+					RouteActivity activity = helper.findActivityByTag(osmValue);
+					if (activity != null) {
+						gpxFileExtensions.put(GpxUtilities.ACTIVITY_TYPE, activity.getId());
+					}
 				}
 			}
 		}