diff --git a/package.json b/package.json
index c55d24b..41e713e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ipwhitelist",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "IP WhiteList microservice for cloud provider",
   "main": "server.js",
   "scripts": {
diff --git a/ui/index.js b/ui/index.js
index c7732ac..3bb3d89 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -52,7 +52,11 @@ function createUiRouter({ auth, MOCK_USERS, authLimiter }) {
       if (!payload) throw new Error('empty payload');
       const rawClientId = payload.ClientID || payload.clientId || payload.sub || '';
       const allClientIds = rawClientId.split(',').map(s => s.trim()).filter(Boolean);
-      const activeClientId = allClientIds[0] || rawClientId;
+      // activeClientId из сессии (переключатель компании) или первая из токена
+      const sessionActive = req.session && req.session.user && req.session.user.activeClientId;
+      const activeClientId = (sessionActive && allClientIds.includes(sessionActive))
+        ? sessionActive
+        : (allClientIds[0] || rawClientId);
 
       req.user = {
         clientId:       rawClientId,