diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 47a09f339..618f29df0 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -122,7 +122,7 @@ dependencies {
 	implementation 'org.parceler:parceler-api:1.1.12'
 	implementation 'com.github.bottom-software-foundation:bottom-java:2.1.0'
 	annotationProcessor 'org.parceler:parceler:1.1.12'
-	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
 	androidTestImplementation 'androidx.test:core:1.4.1-alpha05'
 	androidTestImplementation 'androidx.test.ext:junit:1.1.4-alpha05'
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 97545a1f8..6b60cbcf9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -66,8 +66,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if (getActivity() == null) return;
 						List<Status> filteredItems = filterPosts(result.items);
-						onDataLoaded(filteredItems, !result.items.isEmpty());
 						maxID=result.maxID;
+						onDataLoaded(filteredItems, !result.items.isEmpty());
 						if(result.isFromCache())
 							loadNewPosts();
 					}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index c01d88f15..a8dfc1c39 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -150,13 +150,13 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						if (getActivity() == null) return;
 						if(refreshing)
 							relationships.clear();
+						maxID=result.maxID;
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
 						Set<String> needRelationships=result.items.stream()
 								.filter(ntf->ntf.status==null && !relationships.containsKey(ntf.account.id))
 								.map(ntf->ntf.account.id)
 								.collect(Collectors.toSet());
 						loadRelationships(needRelationships);
-						maxID=result.maxID;
 
 						Markers markers = AccountSessionManager.getInstance().getAccount(accountID).markers;
 						if(offset==0 && !result.items.isEmpty() && !result.isFromCache() && markers != null && markers.notifications != null){