diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts
index 17b45ac9f..10a5ff3e3 100644
--- a/src/app/guards/auth.guard.ts
+++ b/src/app/guards/auth.guard.ts
@@ -18,7 +18,7 @@ export class AuthGuard implements CanActivate {
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-
+    
     // if user not active
     if(!SessionStore.user.Inactivity) {
       this.router.navigate(['/']);
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 10b322cdf..97ffd7398 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -92,7 +92,7 @@ export class RoomService {
       "stream-room-messages",
       (ChatMessage) => {
 
-        setTimeout(()=>{
+        setTimeout(() => {
           ChatMessage = ChatMessage.fields.args[0]
 
           ChatMessage = this.fix_updatedAt(ChatMessage)
@@ -103,7 +103,6 @@ export class RoomService {
           })
   
           if(!messageIsFound) {
-            console.log('messageIsFound', messageIsFound)
             const message = this.prepareMessage(ChatMessage)
   
             this.lastMessage = message
@@ -118,10 +117,12 @@ export class RoomService {
               message: message.msg,
               title: this.name
             });
-  
-            this.addMessageDB(ChatMessage)
-          } else {
-            console.log('have')
+            
+
+            if(this.isSenderIsNotMe(ChatMessage)) {
+              this.addMessageDB(ChatMessage)
+            }
+            
           }
         }, 150)
 
@@ -360,8 +361,16 @@ export class RoomService {
 
       await chatHistory.result.messages.reverse().forEach( async (message) => {
         this.prepareMessage(message)
+
+        const wewMessage = this.prepareMessage(message, false)
+
+        if(wewMessage.offline == false) {
+          this.prepareMessage(message)
+        }
+
       });
 
+      this.storage.set('chatmsg' + this.id, chatHistory)
     })
 
     setTimeout(() => {