diff --git a/homeassistant/core.py b/homeassistant/core.py
index c4dbd1562a5..b9bf49f261c 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -95,7 +95,10 @@ class HomeAssistant(object):
                 'Could not bind to SIGTERM. Are you running in a thread?')
 
         while not request_shutdown.isSet():
-            time.sleep(1)
+            try:
+                time.sleep(1)
+            except KeyboardInterrupt:
+                break
 
         self.stop()
         return RESTART_EXIT_CODE if request_restart.isSet() else 0