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 d82738b..24e68b3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
@@ -115,7 +115,6 @@
       }
     } catch (Exception ex) {
       LOGGER.warn("#disconnect: " + ex.getClass().getName());
-    } finally {
       connection = null;
       publishChannel = null;
     }
@@ -136,5 +135,7 @@
   @Override
   public void shutdownCompleted(ShutdownSignalException arg0) {
     LOGGER.info("Disconnected.");
+    connection = null;
+    publishChannel = null;
   }
 }