diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/ManageCachedStatusAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/ManageCachedStatusAsyncTask.java
index 1d3fb72b1..fe7506c9d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/ManageCachedStatusAsyncTask.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/ManageCachedStatusAsyncTask.java
@@ -48,9 +48,11 @@ public class ManageCachedStatusAsyncTask extends AsyncTask<Void, Void, Void> {
     @Override
     protected Void doInBackground(Void... params) {
         APIResponse apiResponse = new API(contextReference.get()).getStatusbyIdAndCache(statusId);
-        refreshedStatus = apiResponse.getStatuses().get(0);
-        if( refreshedStatus != null){
-            refreshedStatus.setcached(true);
+        if( apiResponse.getStatuses().size() > 0){
+            refreshedStatus = apiResponse.getStatuses().get(0);
+            if( refreshedStatus != null){
+                refreshedStatus.setcached(true);
+            }
         }
         return null;
     }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index b2c60a0a4..70b381f94 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -3207,6 +3207,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     }
 
     public void notifyStatusWithActionChanged(Status status){
+        if( status == null)
+            return;
         for (int i = 0; i < statusListAdapter.getItemCount(); i++) {
             //noinspection ConstantConditions
             if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {