diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index fe7bcc1ed..08dab3da7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -276,21 +276,18 @@ public class XiaomiCharacteristic {
         final boolean encrypt = isEncrypted && authService.isEncryptionInitialized();
 
         if (encrypt) {
-            currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), encryptedIndex));
+            currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), incrementNonce ? encryptedIndex : 0));
         }
 
         if (shouldWriteChunked(currentPayload.getBytesToSend())) {
-            if (encrypt) {
+            if (encrypt && incrementNonce) {
                 // Prepend encrypted index for the nonce
                 currentPayload.setBytesToSend(
                         ByteBuffer.allocate(2 + currentPayload.getBytesToSend().length).order(ByteOrder.LITTLE_ENDIAN)
-                                .putShort(encryptedIndex)
+                                .putShort(encryptedIndex++)
                                 .put(currentPayload.getBytesToSend())
                                 .array()
                 );
-                if (incrementNonce) {
-                    encryptedIndex++;
-                }
             }
 
             LOG.debug("Sending {} - chunked", currentPayload.getTaskName());
@@ -319,9 +316,10 @@ public class XiaomiCharacteristic {
             buf.put((byte) 2); // 2 for command
             buf.put((byte) (encrypt ? 1 : 2));
             if (encrypt) {
-                buf.putShort(encryptedIndex);
                 if (incrementNonce) {
-                    encryptedIndex++;
+                    buf.putShort(encryptedIndex++);
+                } else {
+                    buf.putShort((short) 0);
                 }
             }
             buf.put(currentPayload.getBytesToSend()); // it's already encrypted
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 8bb7df6db..c2abbf3fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -244,6 +244,7 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
         if (success) {
             setWatchface(fwHelper.getId());
+            requestWatchfaceList();
         }
 
         fwHelper = null;