diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 7da1e6658e1..ac9d5eabd70 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -258,7 +258,10 @@ def run_hass_process(hass_proc):
         hass_proc.join()
     except KeyboardInterrupt:
         request_stop()
-        hass_proc.join()
+        try:
+            hass_proc.join()
+        except KeyboardInterrupt:
+            return False
     return not requested_stop.isSet() and hass_proc.exitcode > 0