diff --git a/API/Controllers/Auth/AppUserController.cs b/API/Controllers/Auth/AppUserController.cs
index 56ed9c9..3ad1732 100644
--- a/API/Controllers/Auth/AppUserController.cs
+++ b/API/Controllers/Auth/AppUserController.cs
@@ -21,8 +21,13 @@ namespace API.Controllers.Auth
                 .OrderBy(x => x.UserName)
                 .ToListAsync();
 
-            var tasks = users.Select(user => user.ToCurrentUserResponseAsync(userManager));
-            return Ok(await Task.WhenAll(tasks));
+            var responses = new List<CurrentUserResponse>(users.Count);
+            foreach (var user in users)
+            {
+                responses.Add(await user.ToCurrentUserResponseAsync(userManager));
+            }
+
+            return Ok(responses);
         }
 
         [HttpGet("{id:guid}")]