diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java b/MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java
index c10385fcb..4a1a66379 100644
--- a/MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java
+++ b/MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java
@@ -357,7 +357,7 @@ public class TripStatistics implements Parcelable {
    * Gets the maximum speed in meters/second.
    */
   public double getMaxSpeed() {
-    return maxSpeed;
+    return Math.max(maxSpeed, getAverageMovingSpeed());
   }
 
   /**