1 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index c6f024eb49..2a7799b15c 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -758,13 +758,6 @@ where
             }
         }
 
-        // If auto-connect is enabled, block all traffic before shutting down to ensure
-        // that no traffic can leak during boot.
-        #[cfg(windows)]
-        if self.settings.auto_connect {
-            self.send_tunnel_command(TunnelCommand::BlockWhenDisconnected(true));
-        }
-
         self.finalize().await;
         Ok(())
     }
@@ -2144,6 +2137,13 @@ where
     }
 
     fn trigger_shutdown_event(&mut self) {
+        // If auto-connect is enabled, block all traffic before shutting down to ensure
+        // that no traffic can leak during boot.
+        #[cfg(windows)]
+        if self.settings.auto_connect {
+            self.send_tunnel_command(TunnelCommand::BlockWhenDisconnected(true));
+        }
+
         self.state.shutdown(&self.tunnel_state);
         self.disconnect_tunnel();
     }