diff --git a/android/app/src/main/java/com/chatman/HomeFragment.java b/android/app/src/main/java/com/chatman/HomeFragment.java
index 487d4b77e09f13967ef8f337a3a97ce99f96ecf0..88b9c85b4921a3e6955d3096b95ddcb1369942b1 100644
--- a/android/app/src/main/java/com/chatman/HomeFragment.java
+++ b/android/app/src/main/java/com/chatman/HomeFragment.java
@@ -133,6 +133,11 @@ public class HomeFragment extends Fragment {
                 public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     String message = (String) dataSnapshot.child("message").getValue();
                     Log.d(TAG, "onDataChange: message " + message);
+                    for (ChatList chatList : chatLists) {
+                        if (chatList.getIdChatRoom().equals(idChatRoom)) {
+                            chatLists.remove(chatList);
+                        }
+                    }
                     chatLists.add(new ChatList(R.mipmap.chatman_launcher_round, sender, message, idChatRoom));
                     adapter.notifyDataSetChanged();
                 }
@@ -177,6 +182,11 @@ public class HomeFragment extends Fragment {
                 chatRoomSnapshot.getRef().child("messages").addChildEventListener(new MessageChildListener(sender, idChatRoom));
             }
             else {
+                for (ChatList chatList : chatLists) {
+                    if (chatList.getIdChatRoom().equals(idChatRoom)) {
+                        chatLists.remove(chatList);
+                    }
+                }
                 chatLists.add(new ChatList(R.mipmap.chatman_launcher_round, sender, "", idChatRoom));
                 adapter.notifyDataSetChanged();
             }