diff --git a/package-lock.json b/package-lock.json
index f058d9db7..8e4ee7c8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6300,9 +6300,9 @@
       }
     },
     "beast-orm": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.3.tgz",
-      "integrity": "sha512-kSTc8Sosm1CbLjSGc+nA1s9i4QmGQoF1rfWDmhTrHOvH+uZAtRXbZAypzscMmF67g04mK5XAuB+TUoKV5XmNiQ=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.4.tgz",
+      "integrity": "sha512-3x4cw/0/JjrUksNtzUXC1RcBgsTky6uf8fzh6AnbOrzk5Y9KFUStIVkGBPydtxmtxLO3+gtspyqvH5VdIid6FA=="
     },
     "big-integer": {
       "version": "1.6.49",
diff --git a/package.json b/package.json
index 563c6bba6..f0de46d93 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "angular-svg-icon": "^12.0.0",
     "angular-tag-cloud-module": "^5.2.2",
     "base64-js": "^1.5.1",
-    "beast-orm": "^1.0.3",
+    "beast-orm": "^1.0.4",
     "bootstrap": "^4.5.0",
     "build": "0.1.4",
     "capacitor-voice-recorder": "^2.0.0",
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index 44d206942..861a0881f 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -8,6 +8,7 @@ import { NewGroupPage } from '../../new-group/new-group.page';
 import { GroupMessagesPage } from '../group-messages.page';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 
 @Component({
   selector: 'app-group-contacts',
@@ -40,7 +41,8 @@ export class GroupContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     private navParams: NavParams,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public wsChatMethodsService: WsChatMethodsService,
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -91,12 +93,14 @@ export class GroupContactsPage implements OnInit {
     if(this.room.t == "p"){
       this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
+        this.wsChatMethodsService.getAllRooms()
         this.loadUsers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
+        this.wsChatMethodsService.getAllRooms()
         this.loadUsers();
       });
     }
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 0f45b3f82..6680188d3 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -33,7 +33,7 @@ export class ContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     public ThemeService: ThemeService,
-    public WsChatMethodsService: WsChatMethodsService
+    public WsChatMethodsService: WsChatMethodsService,
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -106,6 +106,7 @@ export class ContactsPage implements OnInit {
       console.log(this.room._id);
 
       this.getDirectMessage(this.room._id);
+      this.WsChatMethodsService.getAllRooms()
     });
   }
   getDirectMessage(roomId:any){
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 1db222f9a..3c5e04d68 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -14,7 +14,7 @@ import { StorageService } from 'src/app/services/storage.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { PermissionList } from 'src/app/models/permission/permissionList';
-
+import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'
 @Component({
   selector: 'app-login',
   templateUrl: './login.page.html',
@@ -127,6 +127,8 @@ export class LoginPage implements OnInit {
             this.clearStoreService.clear();
             SessionStore.delete();
             window.localStorage.clear();
+            await MessageModel.deleteAll()
+            await DeleteMessageModel.deleteAll()
 
             await this.authService.SetSession(attempt, this.userattempt);
 
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 3b3fd50d5..d76119ee5 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -195,6 +195,8 @@ export class WsChatMethodsService {
           const users = members.filter(data => data.username != this.sessionStore.user.UserName);
 
           rooms.result.update[index]['members'] = users
+          
+          await this.prepareRoom(roomData);
 
         }
         else {
@@ -203,7 +205,7 @@ export class WsChatMethodsService {
           const users = members.filter(data => data.username != this.sessionStore.user.UserName);
 
           rooms.result.update[index]['members'] = users
-
+          await this.prepareRoom(roomData);
         }
       }
 
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 6dfd88e75..92a8ed595 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -121,6 +121,7 @@ export class ContactsPage implements OnInit {
       console.log(res);
       this.room = res['room'];
       this.openMessagesModal(this.room._id);
+      this.WsChatMethodsService.getAllRooms()
     });
   }
 
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 dcd87d645..f2069114a 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -113,6 +113,7 @@ export class NewGroupPage implements OnInit{
 
     this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
     this.addGroupMessage.emit(res.result.rid);
+    this.wsChatMethodsService.getAllRooms()
   }
 
   async addContacts(){