diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index f975358995..d2a8ce03ca 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -264,6 +264,10 @@ public class ConnectionHelper {
                     Log.i("isMetered: underlying is unmetered");
                     return false;
                 }
+            } else {
+                // Workaround: active network = VPN, active network info = WiFi
+                if (network.equals(active) && !cm.isActiveNetworkMetered())
+                    return false;
             }
         }