diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
index 519eaba0f..cb31b802c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
@@ -283,7 +283,8 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
                         if (req.expectsResponse() && req.getCommandId() == commandId) {
                             try {
                                 req.handleResponse(data);
-                                inProgressRequests.remove(req);
+                                if (req.shouldRemoveAfterHandling())
+                                    inProgressRequests.remove(req);
                                 return true;
                             } catch (IllegalArgumentException e) {
                                 LOG.error("Failed to handle response", e);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
index b82e08dee..6c3a62bfe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
@@ -35,6 +35,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 // Ripped from nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request
 public abstract class Request extends AbstractBTLEOperation<LefunDeviceSupport> {
     protected TransactionBuilder builder;
+    protected boolean removeAfterHandling = true;
     private Logger logger = (Logger) LoggerFactory.getLogger(getName());
 
     protected Request(LefunDeviceSupport support, TransactionBuilder builder) {
@@ -71,6 +72,10 @@ public abstract class Request extends AbstractBTLEOperation<LefunDeviceSupport>
         return true;
     }
 
+    public boolean shouldRemoveAfterHandling() {
+        return removeAfterHandling;
+    }
+
     protected void reportFailure(String message) {
         GB.toast(getContext(), message, Toast.LENGTH_SHORT, GB.ERROR);
     }