diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index 42fb952b45..a68c451be6 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -187,7 +187,13 @@ public class ConnectionHelper {
         Network active = cm.getActiveNetwork();
         if (active == null) {
             Log.i("isMetered: no active network");
-            return null;
+            // Workaround bug in some Android versions
+            NetworkInfo ani = cm.getActiveNetworkInfo();
+            if (ani == null || !ani.isConnected()) {
+                Log.i("isMetered: no active network=" + (ani == null ? null : ani.isConnected()));
+                return null;
+            }
+            return cm.isActiveNetworkMetered();
         }
 
         // onLost [... state: DISCONNECTED/DISCONNECTED ... available: true]