diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
index 9e6009632..308fb803a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
@@ -172,7 +172,9 @@ public class GBDevice implements Parcelable {
         setBatteryState(null);
         setFirmwareVersion(null);
         setRssi(RSSI_UNKNOWN);
-        unsetBusyTask();
+        if (mBusyTask != null) {
+            unsetBusyTask();
+        }
     }
 
     public String getStateString() {