diff --git a/server/src/services/DbCheck.js b/server/src/services/DbCheck.js
index 8ef2d777b..9b2fd680e 100644
--- a/server/src/services/DbCheck.js
+++ b/server/src/services/DbCheck.js
@@ -441,7 +441,21 @@ module.exports = class DbCheck {
     let deDuped = []
     let count = 0
     let distance = softLimit
-    const max = model === 'Pokemon' ? hardLimit / 2 : hardLimit
+    let max = hardLimit
+    switch (model) {
+      case 'Pokemon':
+        max = hardLimit / 2
+        break
+      case 'Gym':
+      case 'Nest':
+      case 'Pokestop':
+      case 'Portal':
+      case 'Route':
+        max = Infinity
+        break
+      default:
+        break
+    }
     const startTime = Date.now()
     while (deDuped.length < this.searchLimit) {
       const loopTime = Date.now()