diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
index 2138508..fc4b9dc 100644
--- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
@@ -162,6 +162,8 @@
         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);
             }
         });
@@ -170,6 +172,8 @@
         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,6 +182,8 @@
         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);
             }
         });
@@ -186,6 +192,8 @@
         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);
             }
         });
@@ -200,7 +208,7 @@
             }
         });
 
-/*
+
         //設定ボタン
         dTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -219,7 +227,7 @@
                 roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes);
             }
         });
-*/
+
         //ランダムボタン
         randomButton.setOnClickListener(new View.OnClickListener() {
             @Override