diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index f34c2db559..be0445f676 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -530,8 +530,15 @@ public class ConnectionHelper {
             return false;
 
         try {
-            for (Network network : cm.getAllNetworks()) {
-                NetworkCapabilities caps = cm.getNetworkCapabilities(network);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                for (Network network : cm.getAllNetworks()) {
+                    NetworkCapabilities caps = cm.getNetworkCapabilities(network);
+                    if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN))
+                        return true;
+                }
+            } else {
+                Network active = cm.getActiveNetwork();
+                NetworkCapabilities caps = (active == null ? null : cm.getNetworkCapabilities(active));
                 if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN))
                     return true;
             }