diff --git a/heat/service.py b/heat/service.py
index 41c7a23b95..4ea5ba0d2d 100644
--- a/heat/service.py
+++ b/heat/service.py
@@ -235,6 +235,7 @@ def wait():
             LOG.debug('%(flag)s : %(flag_get)s' % locals())
     try:
         _launcher.wait()
+        rpc.cleanup()
     except KeyboardInterrupt:
+        rpc.cleanup()
         _launcher.stop()
-    rpc.cleanup()