diff --git a/chat/consumers.py b/chat/consumers.py
index 5d4914ab..c2443e66 100644
--- a/chat/consumers.py
+++ b/chat/consumers.py
@@ -36,6 +36,8 @@ class ChatRoomConsumer(AsyncWebsocketConsumer):
                 defaults={
                     "maker": self.user,
                     "maker_connected": True,
+                    "taker": order.taker,
+                    "taker_connected": True,
                 },
             )
 
@@ -47,6 +49,8 @@ class ChatRoomConsumer(AsyncWebsocketConsumer):
                 defaults={
                     "taker": self.user,
                     "taker_connected": True,
+                    "maker": order.maker,
+                    "maker_connected": False,
                 },
             )
 
diff --git a/chat/views.py b/chat/views.py
index 42012d69..ab288169 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -77,7 +77,7 @@ class ChatView(viewsets.ViewSet):
             },
         )
 
-        # Poor idea: is_peer_connected() mockup. Update connection status based on last time a GET request was sent
+        # is_peer_connected() mockup. Update connection status based on last time a GET request was sent
         if chatroom.maker == request.user:
             chatroom.taker_connected = order.taker.last_login > (
                 timezone.now() - timedelta(minutes=1)