diff --git a/src/core/resource/conversations/modules/Conversations.module.js b/src/core/resource/conversations/modules/Conversations.module.js
index b998cc66d5ee6f82b2b6846447291ebb16641ac4..6f2c97167a9a7d2e7c31f12537e937a500cec7e0 100644
--- a/src/core/resource/conversations/modules/Conversations.module.js
+++ b/src/core/resource/conversations/modules/Conversations.module.js
@@ -118,7 +118,7 @@ const getRequests = (state, conversations) => {
 const groupDataAdapter = (id, data, name, unread, last_msg, admins, members, description) => {
   const user = {
     phone_id: id,
-    avatar: data[0] ? data[0].payload : null,
+    avatar: data && data[0] ? data[0].payload : null,
     names: name,
     surnames: '',
     description,
diff --git a/src/core/resource/roomlist/sagas/Rooms.saga.js b/src/core/resource/roomlist/sagas/Rooms.saga.js
index 377ab2edbf90bd346fd912653cc17480c3d3c28d..5f1c42e83d580bd2770a01de4b0ce301bfd0319e 100644
--- a/src/core/resource/roomlist/sagas/Rooms.saga.js
+++ b/src/core/resource/roomlist/sagas/Rooms.saga.js
@@ -969,7 +969,7 @@ function* responseJoinMemberToRoomNotification() {
         id: rosterId,
         payload: roomPayload.data
       }));
-    } else if (!joinedMember || (groupId && groupId.startsWith('conference_'))) {
+    } else if (!joinedMember || groupId) {
       yield put(roomListActions.update({
         id: rosterId,
         payload: roomPayload.data