diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
index 883818e7e..f7f42d54a 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
@@ -385,10 +385,6 @@ public class TrackPoint {
         return this;
     }
 
-    public boolean hasSensorData() {
-        return hasHeartRate() || hasCadence() || hasPower();
-    }
-
     public boolean hasHeartRate() {
         return heartRate != null;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 2b8a6e426..31666e758 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -279,6 +279,11 @@ public class PreferencesUtils {
         return getBoolean(R.string.settings_sensor_bluetooth_service_filter_enabled_key, DEFAULT);
     }
 
+    public static int getMaxHeartrate() {
+        final int DEFAULT = Integer.parseInt(resources.getString(R.string.settings_sensor_heart_rate_max_default));
+        return getInt(R.string.settings_sensor_heart_rate_max_key, DEFAULT);
+    }
+
     public static boolean shouldShowStatsOnLockscreen() {
         final boolean STATS_SHOW_ON_LOCKSCREEN_DEFAULT = resources.getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default);
         return getBoolean(R.string.stats_show_on_lockscreen_while_recording_key, STATS_SHOW_ON_LOCKSCREEN_DEFAULT);
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 5b12fb8d1..b7e6abb86 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -44,6 +44,9 @@
         true
     </bool>
 
+    <string name="settings_sensor_heart_rate_max_key" translatable="false">maxHeartRate</string>
+    <string name="settings_sensor_heart_rate_max_default" translatable="false">220</string>
+
     <string name="show_on_map_format_key" translatable="false">showOnMapFormatKey</string>
 
     <string name="total_rows_deleted_key" translatable="false">totalRowsDeletedKey</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 99549cc76..dec125e1d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -434,6 +434,8 @@ limitations under the License.
     <string name="settings_sensor_wheel_circumference">Wheel Circumference (mm)</string>
     <string name="settings_sensor_bluetooth_service_filter_enabled">Only show Bluetooth devices that announce required services</string>
 
+    <string name="settings_sensor_heart_rate_max">Zones: maximum Heart rate (bpm)</string>
+
     <!-- Settings Stats -->
     <string name="settings_stats_rate_title">Preferred rate</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
@@ -479,7 +481,7 @@ limitations under the License.
     <string name="stats_distance">Distance</string>
     <string name="stats_total_time">Total time</string>
     <string name="stats_split_interval">Split interval</string>
-    <string name="stats_sensors_heart_rate">Heart Rate</string>
+    <string name="stats_sensors_heart_rate">Heart rate</string>
     <string name="stats_sensors_cadence">Cadence</string>
     <string name="stats_sensors_power">Power</string>
     <string name="stats_clock">Clock</string>
diff --git a/src/main/res/xml/settings_sensors.xml b/src/main/res/xml/settings_sensors.xml
index 23a4be516..1a8130066 100644
--- a/src/main/res/xml/settings_sensors.xml
+++ b/src/main/res/xml/settings_sensors.xml
@@ -9,6 +9,12 @@
             android:defaultValue="@string/sensor_type_value_none"
             android:key="@string/settings_sensor_bluetooth_heart_rate_key"
             android:title="@string/sensor_state_heart_rate" />
+        <EditTextPreference
+            android:defaultValue="@string/settings_sensor_heart_rate_max_default"
+            android:inputType="number"
+            android:key="@string/settings_sensor_heart_rate_max_key"
+            android:title="@string/settings_sensor_heart_rate_max"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_cycling_sensor">