diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 48d7bfd434..02a5b11e53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -167,18 +167,17 @@ public class XiaomiActivityFileFetcher {
         this.awaitingPastResponse = awaiting;
     }
 
-    public boolean isFetching() {
-        return isFetching;
-    }
-
     public void signalComplete() {
         LOG.debug("Nothing more to fetch");
+        final boolean wasFetching = isFetching;
         isFetching = false;
         queueHeld.set(false);
-        mHealthService.getSupport().getDevice().unsetBusyTask();
-        GB.signalActivityDataFinish(mHealthService.getSupport().getDevice());
-        GB.updateTransferNotification(null, "", false, 100, mHealthService.getSupport().getContext());
-        mHealthService.getSupport().getDevice().sendDeviceUpdateIntent(mHealthService.getSupport().getContext());
+        if (wasFetching) {
+            mHealthService.getSupport().getDevice().unsetBusyTask();
+            GB.signalActivityDataFinish(mHealthService.getSupport().getDevice());
+            GB.updateTransferNotification(null, "", false, 100, mHealthService.getSupport().getContext());
+            mHealthService.getSupport().getDevice().sendDeviceUpdateIntent(mHealthService.getSupport().getContext());
+        }
     }
 
     public void resumeFetching() {