diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
index f5b253c8b..65f73a194 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
@@ -375,6 +375,11 @@ public class QHybridSupport extends QHybridBaseSupport {
     }
 
     private boolean handleFileUploadCharacteristic(BluetoothGattCharacteristic characteristic) {
+        if(uploadFileRequest == null){
+            logger.debug("no uploadFileRequest to handle response");
+            return true;
+        }
+
         uploadFileRequest.handleResponse(characteristic);
 
         switch (uploadFileRequest.state){
@@ -388,6 +393,7 @@ public class QHybridSupport extends QHybridBaseSupport {
                 break;
             case UPLOADED:
                 buttonOverwriteListener.OnButtonOverwrite(true);
+                uploadFileRequest = null;
                 break;
         }
         return true;
@@ -409,15 +415,15 @@ public class QHybridSupport extends QHybridBaseSupport {
             Intent i = new Intent(QHYBRID_EVENT_BUTTON_PRESS);
             i.putExtra("BUTTON", button);
 
-            ByteBuffer buffer = ByteBuffer.allocate(16);
-            buffer.put(new byte[]{0x01, 0x00, 0x08});
-            buffer.put(value, 2, 8);
-            buffer.put(new byte[]{(byte)0xFF, 0x05, 0x00, 0x01, 0x00});
+            //ByteBuffer buffer = ByteBuffer.allocate(16);
+            //buffer.put(new byte[]{0x01, 0x00, 0x08});
+            //buffer.put(value, 2, 8);
+            //buffer.put(new byte[]{(byte)0xFF, 0x05, 0x00, 0x01, 0x00});
 
-            UploadFileRequest request = new UploadFileRequest((short)0, buffer.array());
-            for(byte[] packet : request.packets){
-                new TransactionBuilder("File upload").write(getCharacteristic(UUID.fromString("3dda0007-957f-7d4a-34a6-74696673696d")), packet).queue(getQueue());
-            }
+            //UploadFileRequest request = new UploadFileRequest((short)0, buffer.array());
+            //for(byte[] packet : request.packets){
+            //    new TransactionBuilder("File upload").write(getCharacteristic(UUID.fromString("3dda0007-957f-7d4a-34a6-74696673696d")), packet).queue(getQueue());
+            //}
 
             getContext().sendBroadcast(i);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/UploadFileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/UploadFileRequest.java
index f6656160f..0d638ba50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/UploadFileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/UploadFileRequest.java
@@ -38,11 +38,13 @@ public class UploadFileRequest extends Request {
         if (value.length == 4) {
             if (value[1] != 0) {
                 state = UploadState.ERROR;
+                return;
             }
             state = UploadState.UPLOAD;
         }else if(value.length == 9){
             if(value[1] != 0){
                 state = UploadState.ERROR;
+                return;
             }
             state = UploadState.UPLOADED;
         }