diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java
index 960e9f21d..f303632f3 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java
@@ -52,7 +52,7 @@ public class UserSettingsController extends AbstractQueueController {
     public CommonGetAllResponse getAllForCurrentUser() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
-        User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
+        User user = username == null ? null : userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             throw new IllegalStateException("cannot obtain userId from logged in user " + username);
         }
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java
index c8ad5827f..a57ace3b2 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java
@@ -21,7 +21,7 @@ class UserSettingsControllerTest extends AbstractControllerTest {
         //ARRANGE
         UserSettings userSettings = new UserSettings();
         userSettings.setId(currentId.get());
-        userSettings.setUserId(currentId.get());
+        userSettings.setUserId(currentId.get()); // отдаются по userId CLS-64, todo в тесте null
         userSettings.setJson("json");
         userSettings.setVersion("version");