diff --git a/script/home-assistant@.service b/script/home-assistant@.service
index a36a6e743b1..8e520952db9 100644
--- a/script/home-assistant@.service
+++ b/script/home-assistant@.service
@@ -12,8 +12,9 @@ User=%i
 # Enable the following line if you get network-related HA errors during boot
 #ExecStartPre=/usr/bin/sleep 60
 # Use `whereis hass` to determine the path of hass
-ExecStart=/usr/bin/hass
+ExecStart=/usr/bin/hass --runner
 SendSIGKILL=no
+RestartForceExitStatus=100
 
 [Install]
 WantedBy=multi-user.target