diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py
index a20e4118bc..924c2b2064 100755
--- a/selfdrive/manager/manager.py
+++ b/selfdrive/manager/manager.py
@@ -167,9 +167,6 @@ def manager_init() -> None:
   if os.path.isfile(f'{CRASHES_DIR}/error.txt'):
     os.remove(f'{CRASHES_DIR}/error.txt')
 
-  if params.get_bool("HotspotOnBoot"):
-    os.system('nmcli con up Hotspot')
-
 
 def manager_prepare() -> None:
   for p in managed_processes.values():
@@ -286,6 +283,9 @@ def main() -> None:
     cloudlog.warning("shutdown")
     HARDWARE.shutdown()
 
+  if params.get_bool("HotspotOnBoot"):
+    os.system('nmcli con up Hotspot')
+
 
 if __name__ == "__main__":
   unblock_stdout()