diff --git a/flamenco_worker/cli.py b/flamenco_worker/cli.py
index 09d817a8793d396ba32d1689a293bfc2c9fe6a44..04f210fbcd55da13a7a5aa380e72e3a304ecfff4 100644
--- a/flamenco_worker/cli.py
+++ b/flamenco_worker/cli.py
@@ -176,6 +176,8 @@ def main():
         except asyncio.TimeoutError:
             log.debug("Timeout waiting for may-I-run task, "
                       "but that's fine as we're shutting down.")
+        except KeyboardInterrupt:
+            log.info('Keyboard interrupt while shutting down, ignoring as we are shutting down.')
 
         fworker.shutdown()