diff --git a/src/experiments/nanojpeg/experiment.cc b/src/experiments/nanojpeg/experiment.cc
index 19886462..146ddde6 100644
--- a/src/experiments/nanojpeg/experiment.cc
+++ b/src/experiments/nanojpeg/experiment.cc
@@ -97,7 +97,7 @@ bool NanoJPEGExperiment::run()
 	elfreader.~ElfReader();
 
 #if !LOCAL
-	for (int experiment_count = 0; experiment_count < 200; ) { // only do 200 sequential experiments, to prevent swapping
+	for (int experiment_count = 0; experiment_count < 200 || (m_jc.getNumberOfUndoneJobs() != 0) ; ) { // only do 200 sequential experiments, to prevent swapping
 #endif
 
 	// get an experiment parameter set