diff --git a/app/src/main/org/runnerup/util/GraphWrapper.java b/app/src/main/org/runnerup/util/GraphWrapper.java
index 7ce694de7..b94fb317d 100644
--- a/app/src/main/org/runnerup/util/GraphWrapper.java
+++ b/app/src/main/org/runnerup/util/GraphWrapper.java
@@ -26,6 +26,7 @@
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.util.Pair;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
@@ -104,6 +105,19 @@ public String formatLabel(double value, boolean isValueX) {
         graphView2.getViewport().setScalable(true);
         graphView2.getViewport().setScrollable(true);
 
+        // Get min-/maximum of heart rate and use 90%/110% for y axis
+        HRZones hrZones = new HRZones(context);
+        HRZoneCalculator hrZoneCalculator = new HRZoneCalculator(context);
+        int zoneCount = hrZoneCalculator.getZoneCount();
+        Pair<Integer, Integer> MaxValues = hrZones.getHRValues(zoneCount);
+        Pair<Integer, Integer> MinValues = hrZones.getHRValues(1);
+        if(MaxValues != null && MinValues != null){
+            graphView2.getViewport().setMaxY(MaxValues.second*1.1);
+            graphView2.getViewport().setMinY(MinValues.first*0.9);
+            graphView2.getViewport().setYAxisBoundsManual(true);
+        }
+
+
         hrzonesBar = new HRZonesBar(context);
     }