diff --git a/Replicator/ChangesFeed.cc b/Replicator/ChangesFeed.cc
index dd0d649b5..dd96611f3 100644
--- a/Replicator/ChangesFeed.cc
+++ b/Replicator/ChangesFeed.cc
@@ -252,6 +252,8 @@ namespace litecore::repl {
         return true;
     }
 
+    void ChangesFeed::stopObserving() { _changeObserver.reset(); }
+
     // Overridden by ReplicatorChangesFeed
     bool ChangesFeed::getRemoteRevID(RevToSend* rev, C4Document* doc) const { return true; }
 
diff --git a/Replicator/ChangesFeed.hh b/Replicator/ChangesFeed.hh
index 979295e35..78bf695f3 100644
--- a/Replicator/ChangesFeed.hh
+++ b/Replicator/ChangesFeed.hh
@@ -84,6 +84,8 @@ namespace litecore::repl {
         /** Returns true if the given rev matches the push filters. */
         [[nodiscard]] virtual bool shouldPushRev(RevToSend* NONNULL) const;
 
+        void stopObserving();
+
       protected:
         std::string loggingClassName() const override { return "ChangesFeed"; }
 
diff --git a/Replicator/Pusher.cc b/Replicator/Pusher.cc
index 4cb7e13d9..73c50488d 100644
--- a/Replicator/Pusher.cc
+++ b/Replicator/Pusher.cc
@@ -615,6 +615,11 @@ namespace litecore::repl {
         return level;
     }
 
+    void Pusher::changedStatus() {
+        if ( status().level == kC4Stopped ) _changesFeed.stopObserving();
+        Worker::changedStatus();
+    }
+
     void Pusher::afterEvent() {
         // If I would otherwise go idle or stop, but there are revs I want to retry, restart them:
         if ( !_revsToRetry.empty() && connected() && !isBusy() ) retryRevs(std::move(_revsToRetry), false);
diff --git a/Replicator/Pusher.hh b/Replicator/Pusher.hh
index 9237724f9..44ce9f4cc 100644
--- a/Replicator/Pusher.hh
+++ b/Replicator/Pusher.hh
@@ -63,6 +63,8 @@ namespace litecore::repl {
         void          _connectionClosed() override;
         ActivityLevel computeActivityLevel(std::string* reason) const override;
 
+        void changedStatus() override;
+
       private:
         void _start();
         bool isBusy(std::string* reason = nullptr) const;