diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
index ef1dcd07..7b201372 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
@@ -267,16 +267,12 @@ public class LiveActivityFragment extends AbstractChartFragment {
     @Override
     public void onPause() {
         super.onPause();
-        if (pulseScheduler != null) {
-            pulseScheduler.shutdownNow();
-            pulseScheduler = null;
-        }
+        stopActivityPulse();
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        pulseScheduler = startActivityPulse();
     }
 
     private ScheduledExecutorService startActivityPulse() {
@@ -298,6 +294,13 @@ public class LiveActivityFragment extends AbstractChartFragment {
         return service;
     }
 
+    private void stopActivityPulse() {
+        if (pulseScheduler != null) {
+            pulseScheduler.shutdownNow();
+            pulseScheduler = null;
+        }
+    }
+
     /**
      * Called in the UI thread.
      */
@@ -332,10 +335,12 @@ public class LiveActivityFragment extends AbstractChartFragment {
         if (getActivity() != null) {
             getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
+        pulseScheduler = startActivityPulse();
     }
 
     @Override
     protected void onMadeInvisibleInActivity() {
+        stopActivityPulse();
         GBApplication.deviceService().onEnableRealtimeSteps(false);
         GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(false);
         if (getActivity() != null) {