diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index 5184e889..84fe808b 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -363,16 +363,16 @@ public class SinkholeService extends VpnService {
     public void onRevoke() {
         Log.i(TAG, "Revoke");
 
+        // Disable firewall
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        prefs.edit().putBoolean("enabled", false).apply();
+
         if (vpn != null) {
             stopDebug();
             stopVPN(vpn);
             vpn = null;
         }
 
-        // Disable firewall
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        prefs.edit().putBoolean("enabled", false).apply();
-
         // Display warning
         showDisabledNotification();
         Widget.updateWidgets(this);