diff --git a/app/src/main/org/runnerup/workout/WorkoutBuilder.java b/app/src/main/org/runnerup/workout/WorkoutBuilder.java
index 958351ccc..dd8f4e0b3 100644
--- a/app/src/main/org/runnerup/workout/WorkoutBuilder.java
+++ b/app/src/main/org/runnerup/workout/WorkoutBuilder.java
@@ -521,7 +521,7 @@ private static void createAudioCountdown(Step step) {
             case TIME:
                 // seconds
                 Double[] tmp0 = {
-                        60d, 30d, 10d, 5d, 3d, 2d, 1d
+                        60d, 30d, 10d, 5d, 4d, 3d, 2d, 1d
                 };
                 list.addAll(Arrays.asList(tmp0));
                 break;
@@ -536,6 +536,11 @@ private static void createAudioCountdown(Step step) {
                 return;
         }
 
+        // Extent the feedback list with more values for longer countdowns
+        while (step.getDurationValue() / 2 > list.get(0)) {
+            list.add(0, list.get(0) * 2d);
+        }
+
         // Remove all values in list close to the step
         while (list.size() > 0 && step.getDurationValue() < list.get(0) * 1.1d) {
             list.remove(0);