diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
index 446a25a5e..a88ca786f 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -202,11 +202,11 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
             holder.binding.favoriteConversationImageView.setVisibility(View.GONE);
         }
 
-        if (Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
+        if (status != null && Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
             float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, appContext);
             holder.binding.userStatusImage.setImageDrawable(new StatusDrawable(
-                status != null ? status.getStatus() : "",
-                status != null ? status.getIcon() : "",
+                status.getStatus(),
+                status.getIcon(),
                 size,
                 context.getResources().getColor(R.color.bg_default),
                 appContext));
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index a5de7dd67..44f5a5f0d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -472,10 +472,14 @@ public class ConversationsListController extends BaseController implements Searc
 
     @SuppressLint("LongLogTag")
     public void fetchData() {
-        fetchUserStatuses();
+        if (CapabilitiesUtil.isUserStatusAvailable(userUtils.getCurrentUser())) {
+            fetchUserStatusesAndRooms();
+        } else {
+            fetchRooms();
+        }
     }
 
-    private void fetchUserStatuses() {
+    private void fetchUserStatusesAndRooms() {
         ncApi.getUserStatuses(credentials, ApiUtils.getUrlForUserStatuses(currentUser.getBaseUrl()))
             .subscribe(new Observer<StatusesOverall>() {
                 @Override