1 files changed, 7 insertions, 0 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 31f6e656f8..d8ce28893f 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -640,6 +640,13 @@ 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(())
     }