diff --git a/connector/syncthingconnection.cpp b/connector/syncthingconnection.cpp
index 3f1aae4..663d1c0 100644
--- a/connector/syncthingconnection.cpp
+++ b/connector/syncthingconnection.cpp
@@ -63,7 +63,7 @@ SyncthingConnection::SyncthingConnection(const QString &syncthingUrl, const QByt
     , m_status(SyncthingStatus::Disconnected)
     , m_keepPolling(false)
     , m_reconnecting(false)
-    , m_requestCompletion(true)
+    , m_requestCompletion(false)
     , m_lastEventId(0)
     , m_autoReconnectTries(0)
     , m_totalIncomingTraffic(unknownTraffic)
@@ -1805,6 +1805,21 @@ void SyncthingConnection::readFolderErrors(DateTime eventTime, const QJsonObject
 }
 
 void SyncthingConnection::readFolderCompletion(DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index)
+{
+    readFolderCompletion(eventTime, eventData, dirInfo, index, eventData.value(QLatin1String("device")).toString());
+}
+
+void SyncthingConnection::readFolderCompletion(
+    DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId)
+{
+    if (devId.isEmpty() || devId == myId()) {
+        readLocalFolderCompletion(eventTime, eventData, dirInfo, index);
+    } else {
+        readRemoteFolderCompletion(eventTime, eventData, dirInfo, index, devId);
+    }
+}
+
+void SyncthingConnection::readLocalFolderCompletion(DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index)
 {
     auto &neededStats(dirInfo.neededStats);
     auto &globalStats(dirInfo.globalStats);
@@ -1813,10 +1828,10 @@ void SyncthingConnection::readFolderCompletion(DateTime eventTime, const QJsonOb
     const auto previouslyNeeded(neededStats);
     const auto previouslyGlobal(globalStats);
     // read values from event data
-    globalStats.bytes = jsonValueToInt(eventData.value(QStringLiteral("globalBytes")), globalStats.bytes);
-    neededStats.bytes = jsonValueToInt(eventData.value(QStringLiteral("needBytes")), neededStats.bytes);
-    neededStats.deletes = jsonValueToInt(eventData.value(QStringLiteral("needDeletes")), neededStats.deletes);
-    neededStats.deletes = jsonValueToInt(eventData.value(QStringLiteral("needItems")), neededStats.files);
+    globalStats.bytes = jsonValueToInt(eventData.value(QLatin1String("globalBytes")), globalStats.bytes);
+    neededStats.bytes = jsonValueToInt(eventData.value(QLatin1String("needBytes")), neededStats.bytes);
+    neededStats.deletes = jsonValueToInt(eventData.value(QLatin1String("needDeletes")), neededStats.deletes);
+    neededStats.deletes = jsonValueToInt(eventData.value(QLatin1String("needItems")), neededStats.files);
     dirInfo.lastStatisticsUpdate = eventTime;
     dirInfo.completionPercentage = globalStats.bytes ? static_cast<int>((globalStats.bytes - neededStats.bytes) * 100 / globalStats.bytes) : 100;
     emit dirStatusChanged(dirInfo, index);
@@ -1825,6 +1840,29 @@ void SyncthingConnection::readFolderCompletion(DateTime eventTime, const QJsonOb
     }
 }
 
+void SyncthingConnection::readRemoteFolderCompletion(
+    DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId)
+{
+    auto &completion = dirInfo.completionByDevice[devId];
+    auto &needed(completion.needed);
+    const auto previouslyUpdated = !completion.lastUpdate.isNull();
+    const auto previouslyNeeded = !needed.isNull();
+    const auto previousGlobalBytes = completion.globalBytes;
+    completion.lastUpdate = eventTime;
+    completion.percentage = eventData.value(QLatin1String("completion")).toDouble();
+    completion.globalBytes = jsonValueToInt(eventData.value(QLatin1String("globalBytes")));
+    needed.bytes = jsonValueToInt(eventData.value(QLatin1String("needBytes")), needed.bytes);
+    needed.items = jsonValueToInt(eventData.value(QLatin1String("needItems")), needed.items);
+    needed.deletes = jsonValueToInt(eventData.value(QLatin1String("needDeletes")), needed.deletes);
+    emit dirStatusChanged(dirInfo, index);
+    if (needed.isNull() && previouslyUpdated && (previouslyNeeded || previousGlobalBytes != completion.globalBytes)) {
+        int devIndex;
+        if (const auto *const devInfo = findDevInfo(devId, devIndex)) {
+            emit dirCompleted(DateTime::gmtNow(), dirInfo, index, devInfo);
+        }
+    }
+}
+
 /*!
  * \brief Reads results of requestEvents().
  */
@@ -2060,7 +2098,7 @@ void SyncthingConnection::readCompletion()
     case QNetworkReply::NoError: {
         // determine relevant dev/dir
         int index;
-        SyncthingDir *const dir = findDirInfo(dirId, index);
+        auto *const dir = findDirInfo(dirId, index);
         // discard status for unknown dirs
         if (!dir) {
             return;
@@ -2076,25 +2114,7 @@ void SyncthingConnection::readCompletion()
         }
 
         // update the relevant completion info
-        const auto replyObj(replyDoc.object());
-        auto &completion = dir->completionByDevice[devId];
-        auto &needed(completion.needed);
-        const auto previouslyUpdated = !completion.lastUpdate.isNull();
-        const auto previouslyNeeded = !needed.isNull();
-        const auto previousGlobalBytes = completion.globalBytes;
-        completion.lastUpdate = DateTime::gmtNow();
-        completion.percentage = replyObj.value(QLatin1String("completion")).toDouble();
-        completion.globalBytes = jsonValueToInt(replyObj.value(QLatin1String("globalBytes")));
-        needed.bytes = jsonValueToInt(replyObj.value(QLatin1String("needBytes")), needed.bytes);
-        needed.items = jsonValueToInt(replyObj.value(QLatin1String("needItems")), needed.items);
-        needed.deletes = jsonValueToInt(replyObj.value(QLatin1String("needDeletes")), needed.deletes);
-        emit dirStatusChanged(*dir, index);
-        if (needed.isNull() && previouslyUpdated && (previouslyNeeded || previousGlobalBytes != completion.globalBytes)) {
-            int devIndex;
-            if (const auto *devInfo = findDevInfo(devId, devIndex)) {
-                emit dirCompleted(DateTime::gmtNow(), *dir, index, devInfo);
-            }
-        }
+        readRemoteFolderCompletion(DateTime::gmtNow(), replyDoc.object(), *dir, index, devId);
         break;
     }
     default:
diff --git a/connector/syncthingconnection.h b/connector/syncthingconnection.h
index b5aced7..31cba95 100644
--- a/connector/syncthingconnection.h
+++ b/connector/syncthingconnection.h
@@ -210,6 +210,11 @@ private Q_SLOTS:
     void readItemFinished(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData);
     void readFolderErrors(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index);
     void readFolderCompletion(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index);
+    void readFolderCompletion(
+        ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId);
+    void readLocalFolderCompletion(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index);
+    void readRemoteFolderCompletion(
+        ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId);
     void readRemoteIndexUpdated(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData);
     void readRescan();
     void readDevPauseResume();