diff --git a/src/main/java/org/tikv/common/region/RegionManager.java b/src/main/java/org/tikv/common/region/RegionManager.java
index 45cfc5160d..2d84f9988e 100644
--- a/src/main/java/org/tikv/common/region/RegionManager.java
+++ b/src/main/java/org/tikv/common/region/RegionManager.java
@@ -203,9 +203,11 @@ public class RegionManager {
           }
         }
       }
-      // select a tiflash with RR strategy
+      // select a tiflash with Round-Robin strategy
       if (tiflashStores.size() > 0) {
-        store = tiflashStores.get(tiflashStoreIndex.getAndIncrement() % tiflashStores.size());
+        store =
+            tiflashStores.get(
+                Math.floorMod(tiflashStoreIndex.getAndIncrement(), tiflashStores.size()));
       }
 
       if (store == null) {