diff --git a/backend/Api/MoonfinController.cs b/backend/Api/MoonfinController.cs
index 7ac566b..9f3d9e9 100644
--- a/backend/Api/MoonfinController.cs
+++ b/backend/Api/MoonfinController.cs
@@ -862,10 +862,11 @@ public async Task<ActionResult> GetMediaBarItems(
 
         // Resolve settings: device profile → global → admin defaults
         var resolved = await _settingsService.GetResolvedProfileAsync(userId.Value, profile);
+        var isFallback = resolved == null;
         var settings = resolved ?? MoonfinPlugin.Instance?.Configuration?.DefaultUserSettings ?? new MoonfinSettingsProfile();
 
-        var sourceType = settings.MediaBarSourceType ?? "library";
-        var limit = settings.MediaBarItemCount ?? 10;
+        var sourceType = isFallback ? "library" : (settings.MediaBarSourceType ?? "library");
+        var limit = isFallback ? 5 : (settings.MediaBarItemCount ?? 10);
         var excludedGenres = settings.MediaBarExcludedGenres;
         var queryUser = ResolveQueryUser(userId.Value);
 
@@ -886,7 +887,7 @@ public async Task<ActionResult> GetMediaBarItems(
         }
         else
         {
-            items = GetLibraryItems(settings.MediaBarLibraryIds, limit, queryUser, excludedGenres);
+            items = GetLibraryItems(isFallback ? null : settings.MediaBarLibraryIds, limit, queryUser, excludedGenres);
         }
 
         var dtos = items