diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
index 85a9391..a765945 100644
--- a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
+++ b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
@@ -87,6 +87,7 @@
                 }, 10_000); // 10秒後に通知
             }
             foundChatroom(userId,token);
+            System.out.println(chatroomIdLiveData.getValue());
             if (chatroomId != null) loadLatestMessage(chatroomId, userId, token);
             //chatroomIdがnullの時は呼び出さないようにしました
         };
@@ -158,15 +159,17 @@
                 if (response.isSuccessful() && response.body() != null) {
                     Chatroom chatroom = response.body();
 
-                    chatroomIdLiveData.setValue(chatroom.getChatRoomId());
-                    chatFriendToMeLiveData.setValue(
-                            userId.equals(chatroom.getUser0Id())
+                    if(chatroomIdLiveData.getValue() == null ||  !chatroomIdLiveData.getValue().equals(chatroom.getChatRoomId())){
+
+                        chatroomIdLiveData.postValue(chatroom.getChatRoomId());
+                        chatFriendToMeLiveData.postValue(
+                                userId.equals(chatroom.getUser0Id())
                                     ? chatroom.getUser1Id()
                                     : chatroom.getUser0Id()
                     );
-                } else {
-                    chatroomIdLiveData.setValue(null);
-                    chatroomClosed.setValue(true);
+                    }} else {
+//                    chatroomIdLiveData.setValue(null);
+//                    chatroomClosed.setValue(true);
                 }
             }