diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index d2fd761cf..0ccc4616a 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -170,8 +170,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         if (trackPoint.hasLocation() && lastStoredTrackPointWithLocation == null) {
             insertTrackPoint(trackPoint, true);
 
-            handler.removeCallbacks(ON_IDLE);
-            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
+            scheduleNewIdleTimeout();
             return true;
         }
 
@@ -199,16 +198,14 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
             trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
             insertTrackPoint(trackPoint, true);
 
-            handler.removeCallbacks(ON_IDLE);
-            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
+            scheduleNewIdleTimeout();
             return true;
         }
 
         if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval)) {
             insertTrackPoint(trackPoint, false);
 
-            handler.removeCallbacks(ON_IDLE);
-            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
+            scheduleNewIdleTimeout();
             return true;
         }
 
@@ -218,6 +215,15 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         return false;
     }
 
+    private void scheduleNewIdleTimeout() {
+        if (idleDuration.isZero()) {
+            Log.d(TAG, "idle functionality is disabled");
+            return;
+        }
+        handler.removeCallbacks(ON_IDLE);
+        handler.postDelayed(ON_IDLE, idleDuration.toMillis());
+    }
+
     TrackStatistics getTrackStatistics() {
         return trackStatisticsUpdater == null ? null : trackStatisticsUpdater.getTrackStatistics();
     }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 28d10b8dd..f999e9d31 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -344,17 +344,17 @@ public class PreferencesUtils {
     }
 
     static String[] getVoiceAnnouncementFrequencyEntries() {
-        String[] values = resources.getStringArray(R.array.voice_announcement_frequency_values);
-        String[] options = new String[values.length];
-        for (int i = 0; i < values.length; i++) {
-            if (resources.getString(R.string.announcement_off).equals(values[i])) {
-                options[i] = resources.getString(R.string.value_off);
+        String[] entryValues = resources.getStringArray(R.array.voice_announcement_frequency_values);
+        String[] entries = new String[entryValues.length];
+        for (int i = 0; i < entryValues.length; i++) {
+            if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
+                entries[i] = resources.getString(R.string.value_off);
             } else {
-                int value = Integer.parseInt(values[i]);
-                options[i] = resources.getString(R.string.value_integer_minute, Duration.ofSeconds(value).toMinutes());
+                int value = Integer.parseInt(entryValues[i]);
+                entries[i] = resources.getString(R.string.value_integer_minute, Duration.ofSeconds(value).toMinutes());
             }
         }
-        return options;
+        return entries;
     }
 
     /**
@@ -370,23 +370,23 @@ public class PreferencesUtils {
      * @return Result depends on getUnitSystem
      */
     static String[] getVoiceAnnouncementDistanceEntries() {
-        String[] values = resources.getStringArray(R.array.voice_announcement_distance_values);
-        String[] options = new String[values.length];
+        String[] entryValues = resources.getStringArray(R.array.voice_announcement_distance_values);
+        String[] entries = new String[entryValues.length];
         UnitSystem unitSystem = getUnitSystem();
 
         DistanceFormatter formatter = DistanceFormatter.Builder()
                 .setDecimalCount(0)
                 .setUnit(unitSystem)
                 .build(resources);
-        for (int i = 0; i < values.length; i++) {
-            if (resources.getString(R.string.announcement_off).equals(values[i])) {
-                options[i] = resources.getString(R.string.value_off);
+        for (int i = 0; i < entryValues.length; i++) {
+            if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
+                entries[i] = resources.getString(R.string.value_off);
             } else {
-                Distance distance = Distance.one(unitSystem).multipliedBy(Double.parseDouble(values[i]));
-                options[i] = formatter.formatDistance(distance);
+                Distance distance = Distance.one(unitSystem).multipliedBy(Double.parseDouble(entryValues[i]));
+                entries[i] = formatter.formatDistance(distance);
             }
         }
-        return options;
+        return entries;
     }
 
     public static float getVoiceSpeedRate() {
@@ -642,7 +642,9 @@ public class PreferencesUtils {
         for (int i = 0; i < entryValues.length; i++) {
             int value = Integer.parseInt(entryValues[i]);
 
-            if (value == idleDurationDefault) {
+            if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
+                entries[i] = resources.getString(R.string.value_off);
+            } else if (value == idleDurationDefault) {
                 entries[i] = resources.getString(R.string.value_int_seconds, value);
             } else {
                 entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index a3276d42f..58f4b6341 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -127,7 +127,9 @@
 
     <string name="idle_duration_key" translatable="false">idleSpeedDuration</string>
     <string name="idle_duration_default" translatable="false">10</string>
+    <string name="idle_duration_off" translatable="false">0</string>
     <string-array name="idle_duration_values">
+        <item>@string/idle_duration_off</item>
         <item>5</item>
         <item>@string/idle_duration_default</item>
         <item>15</item>