diff --git a/DRAMSys/simulator/TrafficGenerator.cpp b/DRAMSys/simulator/TrafficGenerator.cpp
index 539b0f6f..5d15235d 100644
--- a/DRAMSys/simulator/TrafficGenerator.cpp
+++ b/DRAMSys/simulator/TrafficGenerator.cpp
@@ -277,6 +277,12 @@ void TrafficGenerator::transitionToNextState()
 
 void TrafficGenerator::prepareNextPayload()
 {
+    if (transactionsSent >= maxTransactions)
+    {
+        finished = true;
+        return;
+    }
+
     if (startEvent && transactionsSent == 0)
         wait(*startEvent);