diff --git a/tsdb/engine/tsi1/measurement.go b/tsdb/engine/tsi1/measurement.go
index d07025fa09..960980f419 100644
--- a/tsdb/engine/tsi1/measurement.go
+++ b/tsdb/engine/tsi1/measurement.go
@@ -52,7 +52,7 @@ func (blk *MeasurementBlock) Version() int { return blk.version }
 func (blk *MeasurementBlock) Elem(name []byte) (e MeasurementElem, ok bool) {
 	n := binary.BigEndian.Uint32(blk.hashData[:MeasurementNSize])
 	hash := hashKey(name)
-	pos := int(hash) % int(n)
+	pos := int(hash % n)
 
 	// Track current distance
 	var d int
diff --git a/tsdb/engine/tsi1/tag_set.go b/tsdb/engine/tsi1/tag_set.go
index 4b0661ef18..7e66ce744d 100644
--- a/tsdb/engine/tsi1/tag_set.go
+++ b/tsdb/engine/tsi1/tag_set.go
@@ -63,7 +63,7 @@ func (ts *TagSet) Version() int { return ts.version }
 func (ts *TagSet) TagKeyElem(key []byte) TagKeyElem {
 	keyN := binary.BigEndian.Uint32(ts.hashData[:TagKeyNSize])
 	hash := hashKey(key)
-	pos := int(hash) % int(keyN)
+	pos := int(hash % keyN)
 
 	// Track current distance
 	var d int
@@ -107,7 +107,7 @@ func (ts *TagSet) TagValueElem(key, value []byte) TagValueElem {
 	hashData := ts.data[kelem.Offset:]
 	valueN := binary.BigEndian.Uint32(hashData[:TagValueNSize])
 	hash := hashKey(value)
-	pos := int(hash) % int(valueN)
+	pos := int(hash % valueN)
 
 	// Track current distance
 	var d int