diff --git a/internal/service/commit/find_commits.go b/internal/service/commit/find_commits.go
index 3060aaf52135c0618836dff221bcaafd9b0dd19b..b9ffbec8daeee258e59b7ed16e5464d526388e0a 100644
--- a/internal/service/commit/find_commits.go
+++ b/internal/service/commit/find_commits.go
@@ -29,6 +29,9 @@ func (s *server) FindCommits(req *pb.FindCommitsRequest, stream pb.CommitService
 		}
 	}
 
+	// We are removing the 'rugged walk' implementation
+	req.DisableWalk = true
+
 	client, err := s.CommitServiceClient(ctx)
 	if err != nil {
 		return err
diff --git a/internal/service/commit/find_commits_test.go b/internal/service/commit/find_commits_test.go
index 1acccf44ec7afe97a273f2c06bd7ae8f213a7d07..47aaf11ec4f630802cc271fac7ee8fd9a8b139f8 100644
--- a/internal/service/commit/find_commits_test.go
+++ b/internal/service/commit/find_commits_test.go
@@ -143,22 +143,6 @@ func TestSuccessfulFindCommitsRequest(t *testing.T) {
 				Repository: testRepo,
 				Revision:   []byte("0031876facac3f2b2702a0e53a26e89939a42209"),
 			},
-			ids: []string{
-				"0031876facac3f2b2702a0e53a26e89939a42209",
-				"bf6e164cac2dc32b1f391ca4290badcbe4ffc5fb",
-				"48ca272b947f49eee601639d743784a176574a09",
-				"9d526f87b82e2b2fd231ca44c95508e5e85624ca",
-				"335bc94d5b7369b10251e612158da2e4a4aaa2a5",
-				"1039376155a0d507eba0ea95c29f8f5b983ea34b",
-				"54188278422b1fa877c2e71c4e37fc6640a58ad1",
-				"8b9270332688d58e25206601900ee5618fab2390",
-				"f9220df47bce1530e90c189064d301bfc8ceb5ab",
-				"40d408f89c1fd26b7d02e891568f880afe06a9f8",
-				"df914c609a1e16d7d68e4a61777ff5d6f6b6fde3",
-				"6762605237fc246ae146ac64ecb467f71d609120",
-				"79b06233d3dc769921576771a4e8bee4b439595d",
-				"1a0b36b3cdad1d2ee32457c102a8c0b7056fa863",
-			},
 		},
 		{
 			desc: "revision, default commit limit, bypassing rugged walk",