diff --git a/messaging/internal/repository/channel.go b/messaging/internal/repository/channel.go
index 7d3f1fe51..30003da5a 100644
--- a/messaging/internal/repository/channel.go
+++ b/messaging/internal/repository/channel.go
@@ -130,6 +130,10 @@ func (r *channel) Find(filter *types.ChannelFilter) (types.ChannelSet, error) {
 			sql += " AND c.id IN " + sqlChannelAccess
 			params = append(params, filter.CurrentUserID, types.ChannelTypePublic)
 		}
+
+		if !filter.IncludeDeleted {
+			sql += " AND deleted_at IS NULL"
+		}
 	}
 
 	sql += " ORDER BY c.name ASC"