diff --git a/src/jamidht/conversation.cpp b/src/jamidht/conversation.cpp
index 3c5bf49484e31c6abfb061c4039290f7e67cbf78..392994c2f316ce4c154a1ccf1d9f5c4b75bbcf76 100644
--- a/src/jamidht/conversation.cpp
+++ b/src/jamidht/conversation.cpp
@@ -1637,18 +1637,27 @@ Conversation::Impl::mergeHistory(const std::string& uri)
     return result;
 }
 
-void
+bool
 Conversation::pull(const std::string& deviceId, OnPullCb&& cb, std::string commitId)
 {
     std::lock_guard lk(pimpl_->pullcbsMtx_);
     auto isInProgress = not pimpl_->pullcbs_.empty();
+    auto itPull = std::find_if(pimpl_->pullcbs_.begin(),
+                               pimpl_->pullcbs_.end(),
+                               [&](const auto& elem) { return std::get<0>(elem) == deviceId && std::get<1>(elem) == commitId; });
+    if (itPull != pimpl_->pullcbs_.end()) {
+        cb(false);
+        return false;
+    }
+    JAMI_INFO() << "Sync " << id() << " with " << deviceId;
     pimpl_->pullcbs_.emplace_back(deviceId, std::move(commitId), std::move(cb));
     if (isInProgress)
-        return;
+        return true;
     dht::ThreadPool::io().run([w = weak()] {
         if (auto sthis_ = w.lock())
             sthis_->pimpl_->pull();
     });
+    return true;
 }
 
 void
@@ -1747,8 +1756,8 @@ Conversation::sync(const std::string& member,
                    OnPullCb&& cb,
                    std::string commitId)
 {
-    JAMI_INFO() << "Sync " << id() << " with " << deviceId;
-    pull(deviceId, std::move(cb), commitId);
+    if (!pull(deviceId, std::move(cb), commitId))
+        return;
     dht::ThreadPool::io().run([member, deviceId, a = pimpl_->account_, w = weak_from_this()] {
         auto sthis = w.lock();
         if (auto account = a.lock()) {
diff --git a/src/jamidht/conversation.h b/src/jamidht/conversation.h
index 12015621572283cdfd1af297a0757f65e30c961a..71621ab4e6d8dc215236c14ffa83fd79d26bea7b 100644
--- a/src/jamidht/conversation.h
+++ b/src/jamidht/conversation.h
@@ -319,8 +319,9 @@ public:
      * @param deviceId  Peer device
      * @param cb        On pulled callback
      * @param commitId  Commit id that triggered this fetch
+     * @return true if callback will be called later
      */
-    void pull(const std::string& deviceId, OnPullCb&& cb, std::string commitId = "");
+    bool pull(const std::string& deviceId, OnPullCb&& cb, std::string commitId = "");
     /**
      * Fetch new commits and re-ask for waiting files
      * @param member
diff --git a/src/jamidht/conversation_module.cpp b/src/jamidht/conversation_module.cpp
index 4fb230ce1ff94c7498800bd78e775f05764ffdd7..ad01a002222f27f241f732dfaf3f1df2c7ef62d5 100644
--- a/src/jamidht/conversation_module.cpp
+++ b/src/jamidht/conversation_module.cpp
@@ -608,7 +608,7 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
                             std::lock_guard lk(conv->mtx);
                             conv->pending.reset();
                             // Notify peers that a new commit is there (DRT)
-                            if (not commitId.empty()) {
+                            if (not commitId.empty() && ok) {
                                 shared->sendMessageNotification(*conv->conversation,
                                                                 false,
                                                                 commitId,