diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
index 9a16bdc65..0c6154433 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
@@ -279,6 +279,8 @@ public class ThreadFragment extends StatusListFragment{
 					Status current=getStatusByID(currentID);
 					Status previous=findPreviousStatus(currentID);
 					Status next=findNextStatus(currentID);
+					if(current==null)
+						continue;
 
 					connectUp=previous!=null && previous.id.equals(current.inReplyToId);
 					connectToRoot=mainStatus.id.equals(current.inReplyToId);