diff --git a/pkg/simulation/run.go b/pkg/simulation/run.go
index 00f4da480..24e83eb94 100644
--- a/pkg/simulation/run.go
+++ b/pkg/simulation/run.go
@@ -57,6 +57,8 @@ func (s *Simulation) Run() (Result, error) {
 					break
 				}
 			}
+			//TODO: this may result in unexpected behaviour? but beats infinite loop when out of actions
+			stop = stop || s.noMoreActions
 		} else {
 			stop = s.C.F == f
 		}