diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a7a584434..108afe3d4 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -108,10 +108,10 @@ export class HomePage implements OnInit {
         // alert('login')
         console.log('rocket chat login successfully', message)
         this.RocketChatClientService.getRooms().then((rooms: any)=>{
-          console.log('rooms', rooms)
+          // console.log('rooms', rooms)
 
           rooms.result.update.forEach((room:any) => {
-            console.log('room', room)
+            // console.log('room', room)
             this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
               console.log('subscription', subscription)
             })
diff --git a/src/app/services/chat/chat.service.spec.ts b/src/app/services/chat/chat.service.spec.ts
new file mode 100644
index 000000000..4d8abdfc0
--- /dev/null
+++ b/src/app/services/chat/chat.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ChatService } from './chat.service';
+
+describe('ChatService', () => {
+  let service: ChatService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ChatService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
new file mode 100644
index 000000000..0d00005d1
--- /dev/null
+++ b/src/app/services/chat/chat.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChatService {
+
+  constructor() { }
+}
diff --git a/src/app/services/chat/room.service.spec.ts b/src/app/services/chat/room.service.spec.ts
new file mode 100644
index 000000000..34729ebbf
--- /dev/null
+++ b/src/app/services/chat/room.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RoomService } from './room.service';
+
+describe('RoomService', () => {
+  let service: RoomService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(RoomService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
new file mode 100644
index 000000000..7bfb8d36e
--- /dev/null
+++ b/src/app/services/chat/room.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RoomService {
+
+  constructor() { }
+}
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index bc404caa1..83c641e14 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -2,6 +2,9 @@ import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 
+/**
+ * Use this class to interact with rocketchat realtime API
+ */
 class _RocketChatClientService {
 
   private hasPing = false
@@ -102,7 +105,7 @@ class _RocketChatClientService {
 
   }
 
-  logout(){}
+  logout() {}
 
   send(roomId, message) {
 
@@ -182,7 +185,7 @@ class _RocketChatClientService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.result.id == requestId) { // same request send
+        if(message.msg == 'ready' || message.subs[0] == requestId) { // same request send
           resolve(message)
         }
       }})