diff --git a/server/server/src/sessionManager.ts b/server/server/src/sessionManager.ts
index 8a36a77ad9..32b9cf4b7b 100644
--- a/server/server/src/sessionManager.ts
+++ b/server/server/src/sessionManager.ts
@@ -1099,7 +1099,7 @@ export class TSessionManager implements SessionManager {
       source: service.token.extra?.service ?? '🤦‍♂️user',
       mode: '🧭 handleRequest'
     })
-    const rateLimit = this.limitter.checkRateLimit(service.getUser())
+    const rateLimit = this.limitter.checkRateLimit(service.getUser() + (service.token.extra?.service ?? ''))
     // If remaining is 0, rate limit is exceeded
     if (rateLimit?.remaining === 0) {
       void ws.send(
@@ -1213,7 +1213,7 @@ export class TSessionManager implements SessionManager {
     ws: ConnectionSocket,
     operation: (ctx: ClientSessionCtx, rateLimit: RateLimitInfo | undefined) => Promise<void>
   ): Promise<RateLimitInfo | undefined> {
-    const rateLimitStatus = this.limitter.checkRateLimit(service.getUser())
+    const rateLimitStatus = this.limitter.checkRateLimit(service.getUser() + (service.token.extra?.service ?? ''))
     // If remaining is 0, rate limit is exceeded
     if (rateLimitStatus?.remaining === 0) {
       return await Promise.resolve(rateLimitStatus)