diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 5e5a13506..e7904bfb5 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -258,6 +258,7 @@
           [eventAttendees]="contacts"
           (onAddEvent)="closeNewEventComponentAndOpenChat($event)"
           (openAttendeesComponent)="closeNewEventComponentAndOpenChat($event)"
+          (backToChat)="backToChat($event)"
           [style.display]="showNewEvent ? 'flex' : 'none'"
           class=" height-100 flex-column">
         </app-new-event>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 449e5b9ac..39e48efc6 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -737,6 +737,18 @@ export class ChatPage implements OnInit {
   }
 
 
+  backToChat({roomId}) {
+
+    const room = this.ChatSystemService.getRoomById(roomId);
+
+    if(room.isGroup) {
+      this.openGroupMessagesPage(room.id);
+    } else {
+      this.openMessagesPage(room.id);
+    }
+    
+  }
+
   async openChatDebuggingPageModal(roomId?: any) {
 
     const modal = await this.modalController.create({
diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts
index e090c5514..a8041828c 100644
--- a/src/app/pages/chat/new-group/new-group.page.ts
+++ b/src/app/pages/chat/new-group/new-group.page.ts
@@ -85,6 +85,7 @@ export class NewGroupPage implements OnInit {
 
     this.isGroupCreated = true;
     this.addContacts(res.result);
+    this.ChatSystemService.getAllRooms();
     
     setTimeout(() => {
       this.ChatSystemService.subscribeToRoomUpdate(res.result.rid, res.result);
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 1d5272e58..d391bf9d0 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -393,6 +393,7 @@ export class ChatSystemService {
         room.receiveMessageDelete();
         room.sortRoomList = this.sortRoomList
         room.chatServiceDeleteRoom = this.deleteRoom
+        room.isGroup = !this.isIndividual(roomData)
 
         // create individual room
         if(this.isIndividual(roomData)) {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index df86d73eb..a0b5136fa 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -64,6 +64,7 @@ export class RoomService {
     }
   }
 
+  isGroup: boolean
   subscribeAttempt = false
 
   scrollDown = () => { }
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index c2493adb4..e168dcd11 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -84,6 +84,7 @@ export class NewEventPage implements OnInit {
   @Output() clearContact = new EventEmitter<any>();
   @Output() GoBackEditOrAdd  = new EventEmitter<any>();
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
+  @Output() backToChat = new EventEmitter<any>();
 
   documents:SearchList[] = [];
 
@@ -334,10 +335,10 @@ export class NewEventPage implements OnInit {
   close() {
 
     this.deleteTemporaryData();
-    this.cloneAllmobileComponent.emit({roomId:this.roomId});
     this.clearContact.emit();
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
+    this.backToChat.emit({roomId:this.roomId})
   }
 
   getRecurrenceTypes() {
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 86106459e..b009ab5bf 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -170,6 +170,8 @@ export class NewGroupPage implements OnInit{
       })
     });
 
+    this.ChatSystemService.getAllRooms();
+
     setTimeout(() => {
       this.groupName = ""
     }, 150);