diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
index 0fdb2c0..725f9ca 100644
--- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
@@ -95,6 +95,10 @@
                 irisMembers.forEach(m -> viewMembers.add(m.getNickname()));
                 allMembers = irisMembers;
 
+                Member myInfo = allMembers.get(myNameIndex(allMembers,myName));
+                ((Iris) getApplication()).setMaster(myInfo.isMaster());
+                ((Iris) getApplication()).setTeam(myInfo.getBelongs());
+
                 BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, allMembers);
                 membersList.setAdapter(adapter);
 
@@ -158,8 +162,6 @@
         redMasterButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(true);
-                ((Iris) getApplication()).setTeam("r");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"r",true);
             }
         });
@@ -168,8 +170,6 @@
         redSpyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(false);
-                ((Iris) getApplication()).setTeam("r");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"r",false);
             }
         });
@@ -178,8 +178,6 @@
         blueMasterButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(true);
-                ((Iris) getApplication()).setTeam("b");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",true);
             }
         });
@@ -188,8 +186,6 @@
         blueSpyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(false);
-                ((Iris) getApplication()).setTeam("b");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false);
             }
         });
@@ -325,5 +321,13 @@
         builder.show();
     }
 
+    private int myNameIndex(List<Member> list, String name){
+        for(int i = 0; i < list.size(); i++){
+            if(list.get(i).getNickname().equals(name)) {
+                return i;
+            }
+        }
+        return 0;
+    }
 
 }
\ No newline at end of file