diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index b56703cc22..35a5423a5d 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -252,6 +252,8 @@ public class ConnectionHelper {
             NetworkInfo ani = cm.getActiveNetworkInfo();
             if (ani == null || !ani.isConnected())
                 return null;
+            if (vpn_only && !vpnActive(context))
+                return null;
             return cm.isActiveNetworkMetered();
         }