diff --git a/src/models/messagefiltermodel.cpp b/src/models/messagefiltermodel.cpp
index b1fe0f400..caeb56dcd 100644
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -79,7 +79,7 @@ bool MessageFilterModel::eventIsVisible(int sourceRow, const QModelIndex &source
 
 QVariant MessageFilterModel::data(const QModelIndex &index, int role) const
 {
-    if (role == MessageEventModel::DelegateTypeRole) {
+    if (role == MessageEventModel::DelegateTypeRole && NeoChatConfig::self()->showAllEvents()) {
         if (!eventIsVisible(index.row(), index.parent())) {
             return DelegateType::Other;
         }