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 93e6d29eb..46c162144 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -98,10 +98,8 @@ public class HomeTimelineFragment extends FabStatusListFragment {
 	@Override
 	protected void onHidden(){
 		super.onHidden();
-		// workaround for mastodon#512. revert if fixed otherwise
-		int position = list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset();
-		if(!data.isEmpty() && position >= 0 && position < displayItems.size()){
-			String topPostID=displayItems.get(position).parentID;
+		if(!data.isEmpty()){
+			String topPostID=displayItems.get(Math.max(0, list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset())).parentID;
 			if(!topPostID.equals(lastSavedMarkerID)){
 				lastSavedMarkerID=topPostID;
 				new SaveMarkers(topPostID, null)