diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 15f7445ce..ce15c110f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -57,11 +57,11 @@ public class GetAuthRequest extends Request {
         this.authVersion = paramsProvider.getAuthVersion();
         this.authAlgo = paramsProvider.getAuthAlgo();
         this.deviceSupportType = paramsProvider.getDeviceSupportType();
+        this.huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, deviceSupportType);
     }
 
     @Override
     protected List<byte[]> createRequest() throws RequestCreationException {
-        huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, deviceSupportType);
         byte[] nonce;
 
         try {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
index 193cb4edc..cb418abbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
@@ -102,7 +102,7 @@ public class Request {
     protected RequestCallback finalizeReq = null;
     // Stop chaining requests and clean support.inProgressRequests from these requests
     protected boolean stopChain = false;
-    protected static HuaweiCrypto huaweiCrypto = null;
+    protected HuaweiCrypto huaweiCrypto = null;
     protected boolean addToResponse = true;
 
     public static class RequestCallback {