diff --git a/src/experiments/weather-monitor/experiment.cc b/src/experiments/weather-monitor/experiment.cc
index 03fbf4bd..e923b7a2 100644
--- a/src/experiments/weather-monitor/experiment.cc
+++ b/src/experiments/weather-monitor/experiment.cc
@@ -139,7 +139,7 @@ bool WeatherMonitorExperiment::run()
 #elif 0
 	// STEP 3: The actual experiment.
 #if !LOCAL
-	for (int i = 0; i < 50; ++i) { // only do 50 sequential experiments, to prevent swapping
+	for (int i = 0; i < 50 || (m_jc.getNumberOfUndoneJobs() != 0) ; ++i) { // only do 50 sequential experiments, to prevent swapping
 	// 50 exp ~ 0.5GB RAM usage per instance (linearly increasing)
 #endif