diff --git a/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/InfinispanBatcher.java b/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/InfinispanBatcher.java
index <HASH>..<HASH> 100644
--- a/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/InfinispanBatcher.java
+++ b/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/InfinispanBatcher.java
@@ -159,7 +159,7 @@ public class InfinispanBatcher implements Batcher<TransactionBatch> {
 
     @Override
     public TransactionBatch suspendBatch() {
-        if (this.tm == null) return null;
+        if (this.tm == null) return NON_TX_BATCH;
         TransactionBatch batch = CURRENT_BATCH.get();
         if (batch != null) {
             try {
WFLY-<I> NPE during Session.requestDone(...) when using <transaction mode="NONE"/>