diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 1da4fab33..fc5719b70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -87,7 +87,11 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
     }
 
     @Override
-    protected void startAuthentication(TransactionBuilder builder) {
+    protected void startAuthentication(final TransactionBuilder builder) {
+        // FIXME why is this needed? We get an NPE without it
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+
         authService.startEncryptedHandshake(builder);
     }
 }