diff --git a/app/app.iml b/app/app.iml
index 401abb40..5e46a900 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,7 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
@@ -76,8 +75,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index d047ab40..5dc08ac7 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -106,7 +106,7 @@ public class SinkholeService extends VpnService {
         private void handleIntent(Intent intent) {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
 
-            Command cmd = (intent == null ? Command.start : (Command) intent.getSerializableExtra(EXTRA_COMMAND));
+            Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND);
             Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
 
             try {
@@ -336,7 +336,7 @@ public class SinkholeService extends VpnService {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             Log.i(TAG, "device idle=" + pm.isDeviceIdleMode());
 
-            // Reload rules when comming from idle mode
+            // Reload rules when coming from idle mode
             if (!pm.isDeviceIdleMode())
                 reload(null, SinkholeService.this);
         }
@@ -420,8 +420,18 @@ public class SinkholeService extends VpnService {
         if (!wl.isHeld())
             wl.acquire();
 
-        // Get command
-        final Command cmd = (intent == null ? Command.start : (Command) intent.getSerializableExtra(EXTRA_COMMAND));
+        // Handle service restart
+        if (intent == null) {
+            // Get enabled
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            boolean enabled = prefs.getBoolean("enabled", false);
+
+            // Recreate intent
+            intent = new Intent(this, SinkholeService.class);
+            intent.putExtra(EXTRA_COMMAND, enabled ? Command.start : Command.stop);
+        }
+
+        Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND);
         Log.i(TAG, "Start intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
 
         // Queue command
@@ -430,7 +440,7 @@ public class SinkholeService extends VpnService {
         msg.obj = intent;
         mServiceHandler.sendMessage(msg);
 
-        return (cmd == Command.stop ? START_NOT_STICKY : START_STICKY);
+        return START_STICKY;
     }
 
     @Override
@@ -451,6 +461,13 @@ public class SinkholeService extends VpnService {
             vpn = null;
         }
 
+        // Make sure wakelock is released
+        PowerManager.WakeLock wl = getLock(this);
+        while (wl.isHeld()) {
+            Log.w(TAG, "Wakelock held");
+            wl.release();
+        }
+
         super.onDestroy();
     }