diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 906134f..4309c0b 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -29,9 +29,6 @@
     private String currentTeam = "r";
     private int turnState = 0;//0:ヒント入力,1:カード選択
 
-    //ヒントの情報
-    private String hint;
-    private Integer hintMax;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -81,14 +78,25 @@
         gameViewModel.getHintLiveData().observe(this, new Observer<String>() {
             @Override
             public void onChanged(String new_Hint) {
-                hint = new_Hint;
+                System.out.println("Gakuto:MasterActivity ヒントが更新されました");
+                EditText Hint = findViewById(R.id.GameHint);
+                if(new_Hint != null){
+                    Hint.setText(new_Hint);
+                }else{
+                    Hint.getEditableText().clear();
+                }
             }
         });
 
         gameViewModel.getMaxLiveData().observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer new_HintMax) {
-                hintMax = new_HintMax;
+                EditText HintMax = findViewById(R.id.GameHintMax);
+                if(new_HintMax != 0){
+                    HintMax.setText(new_HintMax.toString());
+                }else{
+                    HintMax.getEditableText().clear();
+                }
             }
         });
 
@@ -113,23 +121,6 @@
                 //チームの情報を更新
                 turnState = new_turnState;
 
-                //ヒントの情報を反映
-                EditText Hint = findViewById(R.id.GameHint);
-                EditText HintMax = findViewById(R.id.GameHintMax);
-
-
-                if(new_turnState == 0){
-                    //「ヒント入力」になったときは古いヒントを消す
-                    Hint.getEditableText().clear();
-                    HintMax.getEditableText().clear();
-                    hint = null;
-                    hintMax = null;
-                }else{
-                    //「カード選択」のときは新しいヒントを表示する
-                    Hint.setText(hint);
-                    HintMax.setText(hintMax.toString());
-                }
-
                 //操作できるかを判断する。
                 isActive = CheckActivity();
             }
@@ -155,6 +146,9 @@
                 EditText Hint = findViewById(R.id.GameHint);
                 EditText HintMax = findViewById(R.id.GameHintMax);
 
+                String hint = null;
+                Integer hintMax = null;
+
 
                 //テキストを適した変数に変更
                 if(Hint.getText().toString().length() != 0){