diff --git a/src/main/java/com/couchbase/lite/replicator/ChangeTracker.java b/src/main/java/com/couchbase/lite/replicator/ChangeTracker.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/couchbase/lite/replicator/ChangeTracker.java
+++ b/src/main/java/com/couchbase/lite/replicator/ChangeTracker.java
@@ -258,6 +258,7 @@ public class ChangeTracker implements Runnable {
                         boolean responseOK = receivedPollResponse(fullBody);
                         if (mode == ChangeTrackerMode.LongPoll && responseOK) {
                             Log.v(Database.TAG, "Starting new longpoll");
+                            backoff.resetBackoff();
                             continue;
                         } else {
                             Log.w(Database.TAG, "Change tracker calling stop");
Fix for issue #<I>.  Unit test added in last commit now passes.

<URL>