diff --git a/messaging/internal/repository/message.go b/messaging/internal/repository/message.go
index f3cb904f2..a24746286 100644
--- a/messaging/internal/repository/message.go
+++ b/messaging/internal/repository/message.go
@@ -152,8 +152,6 @@ func (r *message) Find(filter *types.MessageFilter) (types.MessageSet, error) {
 		for _, id := range filter.Type {
 			params = append(params, id)
 		}
-	} else {
-		sql += " AND reply_to = 0 "
 	}
 
 	// first, exclusive
diff --git a/messaging/internal/repository/message_test.go b/messaging/internal/repository/message_test.go
index e8c7bfa79..093e2f387 100644
--- a/messaging/internal/repository/message_test.go
+++ b/messaging/internal/repository/message_test.go
@@ -103,8 +103,8 @@ func TestReplies(t *testing.T) {
 
 		{
 			mm, err = msgRpo.Find(&types.MessageFilter{
-				RepliesTo: msg.ID,
-				ChannelID: ch.ID,
+				ThreadID:  []uint64{msg.ID},
+				ChannelID: []uint64{ch.ID},
 			})
 
 			test.Assert(t, err == nil, "FindMessages error: %+v", err)
@@ -114,7 +114,7 @@ func TestReplies(t *testing.T) {
 
 		{
 			mm, err = msgRpo.FindThreads(&types.MessageFilter{
-				ChannelID: ch.ID,
+				ChannelID: []uint64{ch.ID},
 			})
 
 			test.Assert(t, err == nil, "FindThreads error: %+v", err)
@@ -125,7 +125,7 @@ func TestReplies(t *testing.T) {
 
 		{
 			mm, err = msgRpo.Find(&types.MessageFilter{
-				ChannelID: ch.ID,
+				ChannelID: []uint64{ch.ID},
 			})
 
 			test.Assert(t, err == nil, "FindMessages error: %+v", err)