diff --git a/modules/messaging/src/main/java/org/projectodd/wunderboss/messaging/hornetq/HornetQXASession.java b/modules/messaging/src/main/java/org/projectodd/wunderboss/messaging/hornetq/HornetQXASession.java
index <HASH>..<HASH> 100644
--- a/modules/messaging/src/main/java/org/projectodd/wunderboss/messaging/hornetq/HornetQXASession.java
+++ b/modules/messaging/src/main/java/org/projectodd/wunderboss/messaging/hornetq/HornetQXASession.java
@@ -47,8 +47,12 @@ public class HornetQXASession extends HornetQSession implements Synchronization 
 
     @Override
     public boolean enlist() throws Exception {
-        XAResource resource = ((XAJMSContext) context()).getXAResource();
-        return tm.getTransaction().enlistResource(resource);
+        if (!WunderBoss.inContainer()) {
+            XAResource resource = ((XAJMSContext) context()).getXAResource();
+            return tm.getTransaction().enlistResource(resource);
+        } else {
+            return true;
+        }
     }
 
     @Override
Only enlist session out-of-container; inside they're auto-enlisted

Enlisting twice yields weird "XAER-NOTA" and "xid has been replaced"
warnings that fail the tx.