diff --git a/ikasaneip/component/endpoint/big-queue/src/main/java/org/ikasan/component/endpoint/bigqueue/consumer/BigQueueConsumer.java b/ikasaneip/component/endpoint/big-queue/src/main/java/org/ikasan/component/endpoint/bigqueue/consumer/BigQueueConsumer.java
index 1d4729b679..c8fd50066a 100644
--- a/ikasaneip/component/endpoint/big-queue/src/main/java/org/ikasan/component/endpoint/bigqueue/consumer/BigQueueConsumer.java
+++ b/ikasaneip/component/endpoint/big-queue/src/main/java/org/ikasan/component/endpoint/bigqueue/consumer/BigQueueConsumer.java
@@ -286,10 +286,12 @@ public void commit(Xid xid, boolean onePhase) throws XAException {
         try {
             inboundQueue.dequeue();
             inboundQueue.gc();
-            this.addInboundListener();
         } catch (IOException e) {
             throw new XAException(e.getMessage());
         }
+        finally {
+            this.addInboundListener();
+        }
     }
 
     @Override
@@ -330,10 +332,12 @@ public void rollback(Xid xid) throws XAException {
             if(this.bigQueueConsumerConfiguration.isPutErrorsToBackOfQueue()) {
                 inboundQueue.enqueue(inboundQueue.dequeue());
             }
-            this.addInboundListener();
         } catch (IOException e) {
             throw new XAException(e.getMessage());
         }
+        finally {
+            this.addInboundListener();
+        }
     }
 
     @Override