diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index af35598aa..ef4348c65 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -462,9 +462,12 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
     }
 
     public boolean supportsAgpsUpdates() {
-        return false;
+        return true;
     }
 
+    /**
+     * true for Zepp OS 2.0+, false for Zepp OS 1
+     */
     public boolean sendAgpsAsFileTransfer() {
         return true;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java
index 000a906a2..6d6131990 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java
@@ -61,6 +61,11 @@ public class AmazfitBand7Coordinator extends Huami2021Coordinator {
         return new AmazfitBand7FWInstallHandler(uri, context);
     }
 
+    @Override
+    public boolean supportsAgpsUpdates() {
+        return false;
+    }
+
     @Override
     public boolean supportsBluetoothPhoneCalls(final GBDevice device) {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java
index 7106dc432..8992145ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java
@@ -61,11 +61,6 @@ public class AmazfitGTR3Coordinator extends Huami2021Coordinator {
         return new AmazfitGTR3FWInstallHandler(uri, context);
     }
 
-    @Override
-    public boolean supportsAgpsUpdates() {
-        return true;
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java
index a377b82ef..36a6ce6da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java
@@ -61,6 +61,11 @@ public class AmazfitGTR3ProCoordinator extends Huami2021Coordinator {
         return new AmazfitGTR3ProFWInstallHandler(uri, context);
     }
 
+    @Override
+    public boolean sendAgpsAsFileTransfer() {
+        return false;
+    }
+
     @Override
     public boolean supportsBluetoothPhoneCalls(final GBDevice device) {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java
index bcfb14020..4da7e9513 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java
@@ -66,11 +66,6 @@ public class AmazfitGTR4Coordinator extends Huami2021Coordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsAgpsUpdates() {
-        return true;
-    }
-
     @Override
     public boolean supportsGpxUploads() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java
index 5ad214ffd..1703723c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java
@@ -61,11 +61,6 @@ public class AmazfitGTS3Coordinator extends Huami2021Coordinator {
         return new AmazfitGTS3FWInstallHandler(uri, context);
     }
 
-    @Override
-    public boolean supportsAgpsUpdates() {
-        return true;
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java
index 8f96ffa7c..6eed3f55c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java
@@ -66,11 +66,6 @@ public class AmazfitGTS4Coordinator extends Huami2021Coordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsAgpsUpdates() {
-        return true;
-    }
-
     @Override
     public boolean supportsGpxUploads() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java
index 4abf0f513..c7898e081 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java
@@ -61,6 +61,11 @@ public class AmazfitGTS4MiniCoordinator extends Huami2021Coordinator {
         return new AmazfitGTS4MiniFWInstallHandler(uri, context);
     }
 
+    @Override
+    public boolean sendAgpsAsFileTransfer() {
+        return false;
+    }
+
     @Override
     public boolean supportsBluetoothPhoneCalls(final GBDevice device) {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java
index 920ce80d3..b9031ac44 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java
@@ -71,6 +71,11 @@ public class AmazfitTRex2Coordinator extends Huami2021Coordinator {
         return true;
     }
 
+    @Override
+    public boolean sendAgpsAsFileTransfer() {
+        return false;
+    }
+
     @Override
     public boolean supportsBluetoothPhoneCalls(final GBDevice device) {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java
index 057b4f9d6..567dc47f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java
@@ -61,6 +61,11 @@ public class MiBand7Coordinator extends Huami2021Coordinator {
         return new MiBand7FWInstallHandler(uri, context);
     }
 
+    @Override
+    public boolean supportsAgpsUpdates() {
+        return false;
+    }
+
     @Override
     public boolean supportsScreenshots() {
         return false;