diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index f212dda90a9..233cbb2ad17 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -115,10 +115,21 @@ public SamplePackage configureTransactionSampler(TransactionSampler transactionS
     }
 
     /**
-     * Reset pack to its initial state
+     * Reset pack to its initial state and clean up transaction results if needed
      * @param pack the {@link SamplePackage} to reset
      */
     public void done(SamplePackage pack) {
+        Sampler sampler = pack.getSampler();
+        if (sampler instanceof TransactionSampler) {
+            TransactionSampler transactionSampler = (TransactionSampler) sampler;
+            TransactionController controller = transactionSampler.getTransactionController();
+            if (transactionSampler.isTransactionDone()) {
+                // Create new sampler for next iteration
+                TransactionSampler newSampler = new TransactionSampler(controller, transactionSampler.getName());
+                SamplePackage newPack = transactionControllerConfigMap.get(controller);
+                newPack.setSampler(newSampler);
+            }
+        }
         pack.recoverRunningVersion();
     }
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 5fd25546bb7..798f83ce62a 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -581,7 +581,8 @@ static Stream<Serializable> serializableObjects() throws Throwable {
         return getObjects(Serializable.class)
                 .stream()
                 .map(Serializable.class::cast)
-                .filter(o -> !o.getClass().getName().endsWith("_Stub"));
+                .filter(o -> !o.getClass().getName().endsWith("_Stub"))
+                .filter(o -> o.getClass().getName().startsWith("org.apache.jmeter."));
     }
 
     /*