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 7712406..1cf6c18 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
@@ -185,20 +185,17 @@
     // ===============================
     // 2. メッセージ送信
     // ===============================
-    public void sendMessage(String chatroomId, String senderId, String message, String token, boolean isFromMainActivity) {
+    public void sendMessage(String chatroomId, String senderId, String message, String token) {
         Call<ChatMessage> call = chatroomResource.sendMessage(token, chatroomId, senderId, message);
         call.enqueue(new Callback<ChatMessage>() {
             @Override
             public void onResponse(Call<ChatMessage> call, Response<ChatMessage> response) {
                 if (response.isSuccessful() && response.body() != null) {
                     ChatMessage newMessage = response.body();
-                    if (isFromMainActivity) {
-                        chatFriendToMeLiveData.setValue(newMessage.getSenderId());
-                    } else {
                         latestMessage.setValue(newMessage);
                     }
                 }
-            }
+
 
             @Override
             public void onFailure(Call<ChatMessage> call, Throwable t) {
diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
index f8418bb..37bf1b0 100644
--- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
@@ -15,11 +15,11 @@
 import androidx.lifecycle.ViewModelProvider;
 import com.example.tampopo_client.R;
 import com.example.tampopo_client.Tampopo;
-import com.example.tampopo_client.viewmodels.ChatroomViewModel;
+import com.example.tampopo_client.viewmodels.ChatViewModel;
 
 public class ChatActivity extends AppCompatActivity {
 
-  private ChatroomViewModel chatroomViewModel;
+  private ChatViewModel chatroomViewModel;
 
   //メンバー変数
   private EditText senderMessage;
@@ -37,7 +37,7 @@
     EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示
     setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定
 
-    chatroomViewModel = new ViewModelProvider(this).get(ChatroomViewModel.class);
+    chatroomViewModel = new ViewModelProvider(this).get(ChatViewModel.class);
 
     senderMessage = findViewById(R.id.sender_message);
     receiverMessage = findViewById(R.id.receiver_message);