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 76fef14..85a9391 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
@@ -58,10 +58,14 @@
         this.chatroomResource = retrofit.create(ChatroomResource.class);
     }
 
-    public ChatViewModel(String userId, String token, String chatroomId) {
+    public void setChatRoomId(String chatRoomId) {
+        this.chatroomId = chatRoomId;
+    }//追加しました。作られたときはchatroomIdが決まってないので、後からchatroomIdをセットできるようにしました。
+
+    public ChatViewModel(String userId, String token) {
         this.userId = userId;
         this.token = token;
-        this.chatroomId = chatroomId;
+        this.chatroomId = null;//nullにしました引数をなくしました。
 
 
         this.retrofit = new Retrofit.Builder()
@@ -83,7 +87,8 @@
                 }, 10_000); // 10秒後に通知
             }
             foundChatroom(userId,token);
-            loadLatestMessage(chatroomId, userId, token);
+            if (chatroomId != null) loadLatestMessage(chatroomId, userId, token);
+            //chatroomIdがnullの時は呼び出さないようにしました
         };
     }
 
@@ -119,8 +124,10 @@
         try {
             Response<Chatroom> response = call.execute();
             if (response.isSuccessful() && response.body() != null) {
+                Log.d("OK","OK");
                 return response.body().getChatRoomId();
             } else {
+                Log.d("Flase","Flase");
                 return null;
             }
         } catch (IOException e) {
@@ -177,7 +184,7 @@
     // 2. メッセージ送信
     // ===============================
     public void sendMessage(String chatroomId, String senderId, String message, String token) {
-        Call<ChatMessage> call = chatroomResource.sendMessage(token, chatroomId, senderId, message);
+        Call<ChatMessage> call = chatroomResource.sendMessage(chatroomId, senderId, message, token);
         call.enqueue(new Callback<ChatMessage>() {
             @Override
             public void onResponse(Call<ChatMessage> call, Response<ChatMessage> response) {