diff --git a/dist/index.js b/dist/index.js
index 6fb49924..5c24d527 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1924,22 +1924,24 @@
       };
       // view
       this.showChatMessage = (chatMessage) => {
-        const chatMessageModel = new ChatMessageViewModel(
+        const chatMessageViewModel = new ChatMessageViewModel(
           this.coreViewModel,
           this,
           chatMessage,
           chatMessage.sender == this.chatViewModel.settingsViewModel.username.value
         );
+        console.log(chatMessage.body);
         const existingChatMessageViewModel = this.chatMessageViewModels.value.get(chatMessage.id);
         if (existingChatMessageViewModel != void 0) {
           existingChatMessageViewModel.body.value = chatMessage.body;
           existingChatMessageViewModel.status.value = chatMessage.status;
         } else {
-          this.chatMessageViewModels.set(chatMessage.id, chatMessageModel);
+          this.chatMessageViewModels.set(chatMessage.id, chatMessageViewModel);
         }
       };
       // load
       this.loadData = () => {
+        this.chatMessageViewModels.clear();
         for (const chatMessage of this.chatViewModel.chatModel.messages) {
           this.showChatMessage(chatMessage);
         }
diff --git a/src/Model/Chat/chatModel.ts b/src/Model/Chat/chatModel.ts
index 58c3dfd1..42aa555d 100644
--- a/src/Model/Chat/chatModel.ts
+++ b/src/Model/Chat/chatModel.ts
@@ -231,7 +231,6 @@ export default class ChatModel {
       const messagePath: string[] = this.getMessagePath(messageId);
       const chatMessage: ChatMessage | any =
         this.storageModel.readStringifiable(messagePath, ChatMessageReference);
-
       chatMessages.push(chatMessage);
     }
 
diff --git a/src/ViewModel/Pages/messagePageViewModel.ts b/src/ViewModel/Pages/messagePageViewModel.ts
index 35697dbe..59989169 100644
--- a/src/ViewModel/Pages/messagePageViewModel.ts
+++ b/src/ViewModel/Pages/messagePageViewModel.ts
@@ -39,25 +39,28 @@ export default class MessagePageViewModel {
 
   // view
   showChatMessage = (chatMessage: ChatMessage): void => {
-    const chatMessageModel = new ChatMessageViewModel(
+    const chatMessageViewModel = new ChatMessageViewModel(
       this.coreViewModel,
       this,
       chatMessage,
       chatMessage.sender == this.chatViewModel.settingsViewModel.username.value
     );
 
+    console.log(chatMessage.body);
+
     const existingChatMessageViewModel: ChatMessageViewModel | undefined =
       this.chatMessageViewModels.value.get(chatMessage.id);
     if (existingChatMessageViewModel != undefined) {
       existingChatMessageViewModel.body.value = chatMessage.body;
       existingChatMessageViewModel.status.value = chatMessage.status;
     } else {
-      this.chatMessageViewModels.set(chatMessage.id, chatMessageModel);
+      this.chatMessageViewModels.set(chatMessage.id, chatMessageViewModel);
     }
   };
 
   // load
   loadData = (): void => {
+    this.chatMessageViewModels.clear();
     for (const chatMessage of this.chatViewModel.chatModel.messages) {
       this.showChatMessage(chatMessage);
     }