diff --git a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
index cb3a9b755..17c7f7c9f 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
@@ -237,7 +237,7 @@ public class ManageTimelines {
                             return RetrieveFeedsAsyncTask.Type.DIRECT;
                         }
                     } else {
-                        return RetrieveFeedsAsyncTask.Type.DIRECT;
+                        return RetrieveFeedsAsyncTask.Type.CONVERSATION;
                     }
                 case NOTIFICATION:
                     return RetrieveFeedsAsyncTask.Type.NOTIFICATION;
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index c9aefda8f..5cc7c1673 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -468,7 +468,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     @Override
     public void onRetrieveSearch(APIResponse apiResponse) {
 
-        if( apiResponse == null || apiResponse.getResults() == null)
+        if( apiResponse == null || apiResponse.getResults() == null || toot_content == null)
             return;
         app.fedilab.android.client.Entities.Results results = apiResponse.getResults();
         int currentCursorPosition = toot_content.getSelectionStart();