diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
index c76a0564d..62eca2acc 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
@@ -280,9 +280,11 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
         int position = 0;
         for(Status status: this.statuses) {
             if( initialStatus.getId().equals(status.getId())) {
-                this.statuses.get(position).setCard(card);
-                initialStatus.setCard(card);
-                statusListAdapter.notifyItemChanged(position);
+                if( card != null) {
+                    this.statuses.get(position).setCard(card);
+                    initialStatus.setCard(card);
+                    statusListAdapter.notifyItemChanged(position);
+                }
                 return;
             }
             position++;