diff --git a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
index 6695b7df1..55faa63cb 100644
--- a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
@@ -132,13 +132,9 @@ public class DescriptionGenerator {
         // Fastest pace
         writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
 
-        // Max altitude
-        if (stats.hasAltitudeMax()) {
+        // Min and Max altitude
+        if (stats.hasAltitudeExtremities()) {
             writeAltitude(stats.getMaxAltitude(), builder, R.string.description_max_altitude, lineBreak);
-        }
-
-        // Min altitude
-        if (stats.hasAltitudeMin()) {
             writeAltitude(stats.getMinAltitude(), builder, R.string.description_min_altitude, lineBreak);
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
index bdc5b3035..203219d39 100644
--- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
@@ -37,7 +37,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
  *
  * @author Rodrigo Damazio
  */
-//TODO Use null instead of Double.isInfinite
 //TODO Check that data ranges are valid (not less than zero etc.)
 //TODO Should be a Java record
 public class TrackStatistics {
@@ -321,8 +320,8 @@ public class TrackStatistics {
         this.maxSpeed = maxSpeed;
     }
 
-    public boolean hasAltitudeMin() {
-        return !Double.isInfinite(getMinAltitude());
+    public boolean hasAltitudeExtremities() {
+        return altitudeExtremities.hasData();
     }
 
     public double getMinAltitude() {
@@ -333,10 +332,6 @@ public class TrackStatistics {
         altitudeExtremities.setMin(altitude_m);
     }
 
-    public boolean hasAltitudeMax() {
-        return !Double.isInfinite(getMaxAltitude());
-    }
-
     /**
      * Gets the maximum altitude.
      * This is calculated from the smoothed altitude, so this can actually be less than the current altitude.