diff --git a/src/NexusReader.Infrastructure/Services/KnowledgeService.cs b/src/NexusReader.Infrastructure/Services/KnowledgeService.cs
index 5bfeda7..963eb80 100644
--- a/src/NexusReader.Infrastructure/Services/KnowledgeService.cs
+++ b/src/NexusReader.Infrastructure/Services/KnowledgeService.cs
@@ -122,14 +122,11 @@ public class KnowledgeService : IKnowledgeService
         }
         catch (Exception)
         {
-            // Evict from active dictionary on hard exceptions to ensure system resiliency
             _activeRequests.TryRemove(requestKey, out _);
             throw;
         }
         finally
         {
-            // Once a task successfully finishes and persists to the Persistent Database Cache,
-            // we evict it from RAM (_activeRequests) since future hits will leverage the DB cache.
             _activeRequests.TryRemove(requestKey, out _);
         }
     }
diff --git a/src/NexusReader.UI.Shared/Pages/Library.razor b/src/NexusReader.UI.Shared/Pages/Library.razor
index bea0640..94d2355 100644
--- a/src/NexusReader.UI.Shared/Pages/Library.razor
+++ b/src/NexusReader.UI.Shared/Pages/Library.razor
@@ -508,9 +508,12 @@
     private bool _isLoading = true;
     private List<LastReadBookDto>? _books;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        await LoadBooksAsync();
+        if (firstRender)
+        {
+            await LoadBooksAsync();
+        }
     }
 
     private async Task LoadBooksAsync()