diff --git a/checkin_notes b/checkin_notes
index e20364be7d..1c5f35382e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1079,3 +1079,10 @@ David  2 Feb 2009
         DlgItemProperties.cpp
     html/ops/
         autolock.php
+
+David  3 Feb 2009
+    - client: fix bug that caused infinite sched RPCs if project down
+
+    client/
+        cs_scheduler.cpp
+        scheduler_op.cpp
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index f3cafc611b..efcef9d313 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -853,7 +853,6 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
     }
     project->send_time_stats_log = sr.send_time_stats_log;
     project->send_job_log = sr.send_job_log;
-    project->sched_rpc_pending = 0;
     project->trickle_up_pending = false;
 
     // The project returns a hostid only if it has created a new host record.
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index 9face81902..63db8ccbd4 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -459,6 +459,7 @@ bool SCHEDULER_OP::poll() {
                     }
                 }
             } else {
+				cur_proj->sched_rpc_pending = 0;
                 retval = gstate.handle_scheduler_reply(cur_proj, scheduler_url);
                 switch (retval) {
                 case 0: