diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 289b0f1f4..ddcb80942 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -676,10 +676,13 @@ export class RoomService {
 
         if(wewMessage.offline == false) {
           const message = await this.prepareMessageCreateIfNotExist_iD({message:ChatMessage})
-          message.from = 'Offline'
-          message.loadHistory = this.hasLoadHistory
+
+          if(message) {
+            message.from = 'Offline'
+            message.loadHistory = this.hasLoadHistory
+            message?.decryptMessage()
+          }
           
-          message?.decryptMessage()
         } else {
 
           const offlineMessage = await this.prepareMessageCreateIfNotExist({message:ChatMessage})