diff --git a/src/Metrics/RideMetadata.cpp b/src/Metrics/RideMetadata.cpp
index 6b8e95ea1..bf2f8a131 100644
--- a/src/Metrics/RideMetadata.cpp
+++ b/src/Metrics/RideMetadata.cpp
@@ -490,7 +490,11 @@ RideMetadata::sports()
     }
 
     // Ensure default sport
-    if (sportList.isEmpty()) sportList << "Bike";
+    bool hasBike = false;
+    foreach (QString sport, sportList) {
+        if (RideFile::sportTag(sport) == "Bike") hasBike = true;
+    }
+    if (!hasBike) sportList.prepend("Bike");
 
     return sportList;
 }