diff --git a/app/fdroid/release/app-fdroid-release-bookmark-5.apk b/app/fdroid/release/app-fdroid-release-bookmark-5.apk
new file mode 100644
index 000000000..09c34e177
Binary files /dev/null and b/app/fdroid/release/app-fdroid-release-bookmark-5.apk differ
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index 7bfe2f723..77d1dc711 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@@ -260,8 +260,8 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
         }
         int previousPosition = this.statuses.size();
         List<Status> statuses = apiResponse.getStatuses();
-        max_id = apiResponse.getMax_id();
-
+        if( max_id == null || (apiResponse.getMax_id() != null && Long.parseLong(max_id) > Long.parseLong(apiResponse.getMax_id())))
+            max_id = apiResponse.getMax_id();
         flag_loading = (max_id == null );
         if( !swiped && firstLoad && (statuses == null || statuses.size() == 0))
             textviewNoAction.setVisibility(View.VISIBLE);
@@ -318,7 +318,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                     statusListAdapter.notifyItemRangeInserted(position, tmpStatuses.size());
 
                     lv_status.scrollToPosition(position+tmpStatuses.size());
-
                 }
 
             }else {