diff --git a/app/src/main/java/app/fedilab/android/client/entities/StatusCache.java b/app/src/main/java/app/fedilab/android/client/entities/StatusCache.java
index 0be396d69..f4e1265ce 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/StatusCache.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/StatusCache.java
@@ -213,9 +213,9 @@ public class StatusCache {
         if (max_id == null && min_id != null) {
             selection += "AND " + Sqlite.COL_STATUS_ID + " >= '" + min_id + "'";
         } else if (max_id != null && min_id == null) {
-            selection += "AND " + Sqlite.COL_STATUS_ID + " <= '" + max_id + "'";
+            selection += "AND " + Sqlite.COL_STATUS_ID + " < '" + max_id + "'";
         } else if (max_id != null) {
-            selection += "AND " + Sqlite.COL_STATUS_ID + " >= '" + min_id + "' AND " + Sqlite.COL_STATUS_ID + " <= '" + max_id + "'";
+            selection += "AND " + Sqlite.COL_STATUS_ID + " >= '" + min_id + "' AND " + Sqlite.COL_STATUS_ID + " < '" + max_id + "'";
             limit = null;
         }
         try {
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
index 58021a722..7f1b4ab57 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -576,6 +576,8 @@ public class FragmentMastodonTimeline extends Fragment {
                             Marker.MarkerContent markerContent = marker.home;
                             max_id = markerContent.last_read_id;
                             min_id = markerContent.last_read_id;
+                        } else {
+                            max_id = null;
                         }
                         timelinesVM.getHome(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, max_id, null, null, MastodonHelper.statusesPerCall(requireActivity()), false)
                                 .observe(getViewLifecycleOwner(), this::initializeStatusesCommonView);
@@ -596,15 +598,34 @@ public class FragmentMastodonTimeline extends Fragment {
             }
         } else if (direction == DIRECTION.BOTTOM) {
             if (networkAvailable == BaseMainActivity.status.CONNECTED) {
-                timelinesVM.getHome(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, max_id, null, null, MastodonHelper.statusesPerCall(requireActivity()), false)
-                        .observe(getViewLifecycleOwner(), statusesBottom -> dealWithPagination(statusesBottom, DIRECTION.BOTTOM));
+                //We first if we get results from cache
+                timelinesVM.getHomeCache(BaseMainActivity.currentInstance, BaseMainActivity.currentUserID, max_id, null)
+                        .observe(getViewLifecycleOwner(), statusesBottomCache -> {
+                            if (statusesBottomCache != null && statusesBottomCache.statuses != null && statusesBottomCache.statuses.size() > 0) {
+                                dealWithPagination(statusesBottomCache, DIRECTION.BOTTOM);
+                            } else { // If not, we fetch remotely
+                                timelinesVM.getHome(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, max_id, null, null, MastodonHelper.statusesPerCall(requireActivity()), false)
+                                        .observe(getViewLifecycleOwner(), statusesBottom -> dealWithPagination(statusesBottom, DIRECTION.BOTTOM));
+                            }
+                        });
+
             } else {
                 timelinesVM.getHomeCache(BaseMainActivity.currentInstance, BaseMainActivity.currentUserID, max_id, null)
                         .observe(getViewLifecycleOwner(), statusesBottom -> dealWithPagination(statusesBottom, DIRECTION.BOTTOM));
             }
         } else if (direction == DIRECTION.TOP) {
             if (networkAvailable == BaseMainActivity.status.CONNECTED) {
-                timelinesVM.getHome(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, null, null, min_id, MastodonHelper.statusesPerCall(requireActivity()), false)
+                timelinesVM.getHomeCache(BaseMainActivity.currentInstance, BaseMainActivity.currentUserID, null, min_id)
+                        .observe(getViewLifecycleOwner(), statusesTopCache -> {
+                            if (statusesTopCache != null && statusesTopCache.statuses != null && statusesTopCache.statuses.size() > 0) {
+                                dealWithPagination(statusesTopCache, DIRECTION.TOP);
+                            } else {
+                                timelinesVM.getHome(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, null, null, min_id, MastodonHelper.statusesPerCall(requireActivity()), false)
+                                        .observe(getViewLifecycleOwner(), statusesTop -> dealWithPagination(statusesTop, DIRECTION.TOP));
+                            }
+                        });
+            } else {
+                timelinesVM.getHomeCache(BaseMainActivity.currentInstance, BaseMainActivity.currentUserID, null, min_id)
                         .observe(getViewLifecycleOwner(), statusesTop -> dealWithPagination(statusesTop, DIRECTION.TOP));
             }
         }