diff --git a/block/pruning.go b/block/pruning.go
index 190a1dcbf..bac9f0cec 100644
--- a/block/pruning.go
+++ b/block/pruning.go
@@ -15,20 +15,22 @@ func (m *Manager) PruneBlocks(retainHeight uint64) error {
 			gerrc.ErrInvalidArgument)
 	}
 
-	//
+	// prune blocks from blocksync store
 	err := m.P2PClient.RemoveBlocks(context.Background(), m.State.BaseHeight, retainHeight)
 	if err != nil {
 		m.logger.Error("pruning blocksync store", "retain_height", retainHeight, "err", err)
 	}
 
-	pruned, err := m.Store.PruneBlocks(m.State.BaseHeight, retainHeight)
+	// prune blocks from indexer store
+	err = m.indexerService.Prune(m.State.BaseHeight, retainHeight)
 	if err != nil {
-		return fmt.Errorf("pruning dymint store: %w", err)
+		m.logger.Error("pruning indexer", "retain_height", retainHeight, "err", err)
 	}
 
-	err = m.indexerService.Prune(int64(m.State.BaseHeight), int64(retainHeight))
+	// prune blocks from dymint store
+	pruned, err := m.Store.PruneBlocks(m.State.BaseHeight, retainHeight)
 	if err != nil {
-		return fmt.Errorf("pruning indexer: %w", err)
+		return fmt.Errorf("pruning dymint store: %w", err)
 	}
 
 	m.State.BaseHeight = retainHeight
diff --git a/indexers/blockindexer/kv/kv_test.go b/indexers/blockindexer/kv/kv_test.go
index d0f6d2181..abf9a6c32 100644
--- a/indexers/blockindexer/kv/kv_test.go
+++ b/indexers/blockindexer/kv/kv_test.go
@@ -153,7 +153,7 @@ func TestBlockIndexerPruning(t *testing.T) {
 	indexer := blockidxkv.New(prefixStore)
 	numBlocks := uint64(100)
 
-	// index block event data
+	// index block data
 	for i := uint64(1); i <= numBlocks; i++ {
 		indexer.Index(types.EventDataNewBlockHeader{
 			Header:           types.Header{Height: int64(i)},
@@ -167,7 +167,7 @@ func TestBlockIndexerPruning(t *testing.T) {
 	q := query.MustParse(queryString)
 	results, err := indexer.Search(context.Background(), q)
 	require.NoError(t, err)
-	require.Equal(t, numBlocks, len(results))
+	require.Equal(t, numBlocks, uint64(len(results)))
 
 	// prune indexer for all heights
 	pruned, err := indexer.Prune(1, numBlocks+1)