diff --git a/checkin_notes b/checkin_notes
index 58c7d82a73..1c510dda49 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5727,3 +5727,9 @@ David  14 July 2008
         account_finish.php
     sched/
         sched_send.C
+
+David  14 July 2008
+    - scheduler: fix infinite loop in matchmaker sched (from Artyom Sharov)
+
+    sched/
+        sched_send.C
diff --git a/sched/sched_send.C b/sched/sched_send.C
index 7816e3b93b..34dcc112f6 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -1612,6 +1612,8 @@ void JOB_SET::add_job(JOB& job) {
             est_time -= worst_job.est_time;
             disk_usage -= worst_job.disk_usage;
             jobs.pop_back();
+        } else {
+            break;
         }
     }
     while (!jobs.empty()) {
@@ -1620,6 +1622,8 @@ void JOB_SET::add_job(JOB& job) {
             est_time -= worst_job.est_time;
             disk_usage -= worst_job.disk_usage;
             jobs.pop_back();
+        } else {
+            break;
         }
     }
     list<JOB>::iterator i = jobs.begin();