diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
index 6915b2f..92ebd02 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.UUID;
 
 @Singleton
 public class AMQPSession implements ShutdownListener {
@@ -82,7 +81,7 @@
             exchangeType = EXCHANGE_TYPE_FANOUT;
             routingKey = pluginName;
           }
-          exchangeName = UUID.randomUUID().toString();
+          exchangeName = exchangeType + "-" + properties.getAMQPQueue();
           LOGGER.debug("Exchange type: " + exchangeType);
           LOGGER.debug("Declare exchange: " + exchangeName);
           ch.exchangeDeclare(exchangeName, exchangeType, true);