diff --git a/server/src/services/DbManager.js b/server/src/services/DbManager.js
index ae3e3d407..8149f4f78 100644
--- a/server/src/services/DbManager.js
+++ b/server/src/services/DbManager.js
@@ -436,7 +436,22 @@ class DbManager extends Logger {
     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':
+      case 'Station':
+        max = 22222
+        break
+      default:
+        break
+    }
     const startTime = Date.now()
     while (deDuped.length < searchLimit) {
       const loopTime = Date.now()