diff --git a/Sources/justMUSIC/lib/services/PostService.dart b/Sources/justMUSIC/lib/services/PostService.dart
index 015741f..a180f40 100644
--- a/Sources/justMUSIC/lib/services/PostService.dart
+++ b/Sources/justMUSIC/lib/services/PostService.dart
@@ -51,7 +51,9 @@ class PostService {
         .limit(limit)
         .get();
 
-    MyApp.postViewModel.lastPostDiscovery = response.docs.last;
+    MyApp.postViewModel.lastPostDiscovery = response.docs.isNotEmpty
+        ? response.docs.last
+        : MyApp.postViewModel.lastPostDiscovery;
 
     var filteredPosts = response.docs.where((doc) {
       String user = doc["user_id"];