diff --git a/pkg/core/mpt/helpers.go b/pkg/core/mpt/helpers.go
index d61595f100..340bfa4445 100644
--- a/pkg/core/mpt/helpers.go
+++ b/pkg/core/mpt/helpers.go
@@ -13,17 +13,13 @@ func lcp(a, b []byte) []byte {
 		return lcp(b, a)
 	}
 
-	var i int
-	//nolint:intrange // if slices are the same (or one is a prefix for another
-	// one), `range` loops does not assign the latest index to the `i` var, and
-	// the func loses the latest element
-	for i = 0; i < len(b); i++ {
+	for i := range b {
 		if a[i] != b[i] {
-			break
+			return b[:i]
 		}
 	}
 
-	return a[:i]
+	return b
 }
 
 func lcpMany(kv []keyValue) []byte {