diff --git a/tools/chatgui/db/db_manager.cpp b/tools/chatgui/db/db_manager.cpp
index a1fc3b316..5bba5deaa 100644
--- a/tools/chatgui/db/db_manager.cpp
+++ b/tools/chatgui/db/db_manager.cpp
@@ -165,7 +165,7 @@ QByteArray DbManager::getChannelAvatar(const QString& channelId, bool* ok) const
 }
 
 bool DbManager::isChannelMember(const QString& chId, quint64 nodeId) const {
-    const QByteArray sql = QStringLiteral("SELECT 1 FROM \"%1\" WHERE node_id=?").arg(peersTableName(chId)).toUtf8();
+    const QByteArray sql = QStringLiteral("SELECT 1 FROM \"%1\" WHERE node_id=? AND record_state=0").arg(peersTableName(chId)).toUtf8();
     sqlite3_stmt* statement = prepareOrNull(sql.constData());
     if (!statement) return false;
     const int bound = sqlite3_bind_int64(statement, 1, (sqlite3_int64)nodeId);
@@ -422,7 +422,7 @@ QMap<quint64, QString> DbManager::getLocalNicknames(const QString& chId) const {
     QMap<quint64, QString> m;
     if (!m_db) return m;
     QString sql = QStringLiteral(
-        "SELECT node_id, local_nick FROM \"%1\" WHERE local_nick IS NOT NULL AND local_nick != ''"
+        "SELECT node_id, local_nick FROM \"%1\" WHERE record_state=0 AND local_nick IS NOT NULL AND local_nick != ''"
     ).arg(peersTableName(chId));
     sqlite3_stmt* stmt = prepareOrNull(sql.toUtf8().constData());
     if (!stmt) return m;
diff --git a/tools/chatgui/src/member_files/browser.cpp b/tools/chatgui/src/member_files/browser.cpp
index a7c0f9a30..953978f63 100644
--- a/tools/chatgui/src/member_files/browser.cpp
+++ b/tools/chatgui/src/member_files/browser.cpp
@@ -238,7 +238,8 @@ void MemberFileBrowser::setChannel(const QString& channel, quint64 selectedOwner
     gui_bridge_member_files_cancel(m_listId); m_listId = 0; m_group = group; m_path.clear();
     m_servers->blockSignals(true); m_owners->blockSignals(true); m_servers->clear(); m_owners->clear();
     m_owners->addItem(text("All members"), QVariant::fromValue<qulonglong>(0));
-    QString sql = QString("SELECT node_id,adm_tags,length(adm_tags_sig) FROM peers_%1 WHERE deleted=0 AND source=0 ORDER BY node_id").arg(group);
+    QString sql = QString("SELECT node_id,adm_tags,length(adm_tags_sig) FROM peers_%1"
+        " WHERE record_state=0 AND deleted=0 AND source=0 ORDER BY node_id").arg(group);
     sqlite3_stmt* st = m_db->prepareOrNull(sql.toUtf8().constData());
     if (st) {
         int rc;