diff --git a/nova/rpc.py b/nova/rpc.py
index 9f0b507fd63a..29cb3044b4aa 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -348,6 +348,7 @@ class TopicPublisher(Publisher):
         self.routing_key = topic
         self.exchange = FLAGS.control_exchange
         self.durable = False
+        self.auto_delete = True
         super(TopicPublisher, self).__init__(connection=connection)
 
 
@@ -360,6 +361,7 @@ class FanoutPublisher(Publisher):
         self.exchange = '%s_fanout' % topic
         self.queue = '%s_fanout' % topic
         self.durable = False
+        self.auto_delete = True
         LOG.info(_('Creating "%(exchange)s" fanout exchange'),
                  dict(exchange=self.exchange))
         super(FanoutPublisher, self).__init__(connection=connection)