diff --git a/scripts/umbrel-os/services/umbrel-startup.service b/scripts/umbrel-os/services/umbrel-startup.service
index a2dfb69..b9e8595 100644
--- a/scripts/umbrel-os/services/umbrel-startup.service
+++ b/scripts/umbrel-os/services/umbrel-startup.service
@@ -12,7 +12,8 @@ After=docker.service
 
 [Service]
 Type=forking
-TimeoutSec=infinity
+TimeoutStartSec=infinity
+TimeoutStopSec=16min
 ExecStart=/home/umbrel/umbrel/scripts/start
 ExecStop=/home/umbrel/umbrel/scripts/stop
 User=root