diff --git a/back/Infrastructure/Repositories/SpendingGroupRepo.cs b/back/Infrastructure/Repositories/SpendingGroupRepo.cs
index dece4fa..b7a36a3 100644
--- a/back/Infrastructure/Repositories/SpendingGroupRepo.cs
+++ b/back/Infrastructure/Repositories/SpendingGroupRepo.cs
@@ -102,10 +102,13 @@ public class SpendingGroupRepo : ISpendingGroupRepo
                 query = query.Where(x => x.Id == search.Id);
             }
 
-            if (!string.IsNullOrWhiteSpace(search.Name) && search.UserId.HasValue)
+            if (search.UserId.HasValue)
             {
-                query = query.Where(x => x.Name.Contains(search.Name, StringComparison.OrdinalIgnoreCase) 
-                    && x.UserId == search.UserId);
+                query = query.Where(x => x.UserId == search.UserId);
+                if (!string.IsNullOrWhiteSpace(search.Name))
+                {
+                    query = query.Where(x => x.Name.Contains(search.Name, StringComparison.OrdinalIgnoreCase));
+                }
             }
         }