diff --git a/src/librssguard/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp
index a43c195cf..181d49fcc 100644
--- a/src/librssguard/core/feeddownloader.cpp
+++ b/src/librssguard/core/feeddownloader.cpp
@@ -72,7 +72,8 @@ void FeedDownloader::updateFeeds(const QList<Feed*>& feeds) {
   m_feeds.clear();
 
   if (feeds.isEmpty()) {
-    qDebugNN << LOGSEC_FEEDDOWNLOADER << "No feeds to update in worker thread, aborting update.";
+    qWarningNN << LOGSEC_FEEDDOWNLOADER << "No feeds to update in worker thread, aborting update.";
+    finalizeUpdate();
   }
   else {
     qDebugNN << LOGSEC_FEEDDOWNLOADER << "Starting feed updates from worker in thread"
diff --git a/src/librssguard/miscellaneous/feedreader.cpp b/src/librssguard/miscellaneous/feedreader.cpp
index 1b63ed045..6bf54ac12 100644
--- a/src/librssguard/miscellaneous/feedreader.cpp
+++ b/src/librssguard/miscellaneous/feedreader.cpp
@@ -85,6 +85,10 @@ void FeedReader::updateFeeds(const QList<Feed*>& feeds) {
     }
   }
 
+  if (my_feeds.isEmpty()) {
+    return;
+  }
+
   if (!qApp->feedUpdateLock()->tryLock()) {
     qApp->showGuiMessage(Notification::Event::GeneralEvent,
                          {tr("Cannot fetch articles at this point"),