diff --git a/AI.ProfilePhotoMaker.API/Services/Marketing/UserSegmentService.cs b/AI.ProfilePhotoMaker.API/Services/Marketing/UserSegmentService.cs
index 48e8e025..f2aa03aa 100644
--- a/AI.ProfilePhotoMaker.API/Services/Marketing/UserSegmentService.cs
+++ b/AI.ProfilePhotoMaker.API/Services/Marketing/UserSegmentService.cs
@@ -38,55 +38,70 @@ private IQueryable<ApplicationUser> BuildSegmentQuery(string segmentFilter)
         var baseQuery = _db.Users
             .Where(u => u.EmailConfirmed && !u.MarketingOptOut && u.Email != null);
 
-        return segmentFilter switch
+        // Pre-compute upload counts per user as an IQueryable (not materialized).
+        // EF Core composes this into each downstream query as a single subquery/join
+        // instead of a correlated COUNT per user row.
+        var uploadsByUser = _db.UserProfiles
+            .Select(up => new
+            {
+                up.UserId,
+                UploadCount = up.ProcessedImages.Count(i => i.IsOriginalUpload)
+            });
+
+        switch (segmentFilter)
         {
             // Signed up + verified, never uploaded a single selfie
-            SegmentFilters.NoUploads =>
-                from u in baseQuery
-                where !_db.UserProfiles
-                    .Any(up => up.UserId == u.Id &&
-                               up.ProcessedImages.Any(i => i.IsOriginalUpload))
-                select u,
+            case SegmentFilters.NoUploads:
+            {
+                var usersWithUploads = uploadsByUser
+                    .Where(x => x.UploadCount > 0)
+                    .Select(x => x.UserId);
+                return baseQuery.Where(u => !usersWithUploads.Contains(u.Id));
+            }
 
             // Uploaded 1–4 selfies (previously blocked at 10-photo minimum, now eligible)
-            SegmentFilters.StuckUnderMinimum =>
-                from u in baseQuery
-                let uploadCount = _db.UserProfiles
-                    .Where(up => up.UserId == u.Id)
-                    .SelectMany(up => up.ProcessedImages.Where(i => i.IsOriginalUpload))
-                    .Count()
-                where uploadCount >= 1 && uploadCount <= 4
-                select u,
+            case SegmentFilters.StuckUnderMinimum:
+            {
+                var eligibleIds = uploadsByUser
+                    .Where(x => x.UploadCount >= 1 && x.UploadCount <= 4)
+                    .Select(x => x.UserId);
+                return baseQuery.Where(u => eligibleIds.Contains(u.Id));
+            }
 
             // 5+ uploads but never started training
-            SegmentFilters.HasUploadsNoModel =>
-                from u in baseQuery
-                let uploadCount = _db.UserProfiles
-                    .Where(up => up.UserId == u.Id)
-                    .SelectMany(up => up.ProcessedImages.Where(i => i.IsOriginalUpload))
-                    .Count()
-                where uploadCount >= 5
-                    && !_db.ModelCreationRequests.Any(m =>
-                        m.UserId == u.Id
-                        && (m.Status == ModelCreationStatus.Ready
-                            || m.Status == ModelCreationStatus.Creating
-                            || m.Status == ModelCreationStatus.Pending))
-                select u,
+            case SegmentFilters.HasUploadsNoModel:
+            {
+                var withUploads = uploadsByUser
+                    .Where(x => x.UploadCount >= 5)
+                    .Select(x => x.UserId);
+                var withModel = _db.ModelCreationRequests
+                    .Where(m => m.Status == ModelCreationStatus.Ready
+                             || m.Status == ModelCreationStatus.Creating
+                             || m.Status == ModelCreationStatus.Pending)
+                    .Select(m => m.UserId);
+                return baseQuery.Where(u => withUploads.Contains(u.Id) && !withModel.Contains(u.Id));
+            }
 
             // Has uploads but no activity in the last 30 days
-            SegmentFilters.Inactive30d =>
-                from u in baseQuery
-                let cutoff = DateTime.UtcNow.AddDays(-30)
-                where _db.UserProfiles
-                          .Any(up => up.UserId == u.Id &&
-                                     up.ProcessedImages.Any(i => i.IsOriginalUpload))
-                      && !_db.UsageLogs.Any(l => l.UserId == u.Id && l.CreatedAt >= cutoff)
-                select u,
+            case SegmentFilters.Inactive30d:
+            {
+                var cutoff = DateTime.UtcNow.AddDays(-30);
+                var usersWithUploads = uploadsByUser
+                    .Where(x => x.UploadCount > 0)
+                    .Select(x => x.UserId);
+                var recentlyActive = _db.UsageLogs
+                    .Where(l => l.CreatedAt >= cutoff)
+                    .Select(l => l.UserId);
+                return baseQuery.Where(u => usersWithUploads.Contains(u.Id)
+                                         && !recentlyActive.Contains(u.Id));
+            }
 
             // All verified, non-opted-out users
-            SegmentFilters.AllVerified => baseQuery,
+            case SegmentFilters.AllVerified:
+                return baseQuery;
 
-            _ => throw new ArgumentException($"Unknown segment filter: {segmentFilter}")
-        };
+            default:
+                throw new ArgumentException($"Unknown segment filter: {segmentFilter}");
+        }
     }
 }
diff --git a/AI.ProfilePhotoMaker.UI/src/app/admin/admin-campaigns/admin-campaigns.component.ts b/AI.ProfilePhotoMaker.UI/src/app/admin/admin-campaigns/admin-campaigns.component.ts
index 8a1a999a..ccfa7666 100644
--- a/AI.ProfilePhotoMaker.UI/src/app/admin/admin-campaigns/admin-campaigns.component.ts
+++ b/AI.ProfilePhotoMaker.UI/src/app/admin/admin-campaigns/admin-campaigns.component.ts
@@ -138,7 +138,7 @@ export class AdminCampaignsComponent implements OnInit, OnDestroy {
     this.segmentCounting = true;
     this._marketing
       .previewSegment(this.model.segmentFilter)
-      .pipe(takeUntil(this.destroy$))
+      .pipe(timeout(12000), takeUntil(this.destroy$))
       .subscribe({
         next: res => {
           this.segmentCount = res.count;
@@ -146,6 +146,7 @@ export class AdminCampaignsComponent implements OnInit, OnDestroy {
         },
         error: () => {
           this.segmentCounting = false;
+          this.error = 'Segment count timed out or failed. Please try again.';
         },
       });
   }