diff --git a/api-server/src/server/middlewares/rate-limit.js b/api-server/src/server/middlewares/rate-limit.js
index 08f7b8e0d29..b461039a12c 100644
--- a/api-server/src/server/middlewares/rate-limit.js
+++ b/api-server/src/server/middlewares/rate-limit.js
@@ -11,7 +11,11 @@ export default function rateLimitMiddleware() {
     max: 10,
     standardHeaders: true,
     legacyHeaders: false,
+    keyGenerator: req => {
+      return req.headers['x-forwarded-for'] || 'localhost';
+    },
     store: new MongoStore({
+      collectionName: 'UserRateLimit',
       uri: url,
       expireTimeMs: 15 * 60 * 1000
     })