diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 16f1a3c46..e2cdd9c3e 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.0" date="2021-03-03"/>
+    <release version="3.9.0" date="2021-03-05"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/core/messageobject.cpp b/src/librssguard/core/messageobject.cpp
index 4d0bd0e8e..2c8273a53 100755
--- a/src/librssguard/core/messageobject.cpp
+++ b/src/librssguard/core/messageobject.cpp
@@ -184,7 +184,12 @@ void MessageObject::setIsDeleted(bool is_deleted) {
 }
 
 QString MessageObject::feedCustomId() const {
-  return m_feedCustomId;
+  if (m_feedCustomId.isEmpty() || m_feedCustomId == QString::number(NO_PARENT_CATEGORY)) {
+    return m_message->m_feedId;
+  }
+  else {
+    return m_feedCustomId;
+  }
 }
 
 int MessageObject::accountId() const {