diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 1f83b34..47b1621 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -30,7 +30,7 @@
 
     //ヒントの情報
     private String hint = "aaa";
-    private Integer hintMax = 1;
+    private Integer hintMax = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -115,8 +115,18 @@
                 //ヒントの情報を反映
                 EditText Hint = findViewById(R.id.GameHint);
                 EditText HintMax = findViewById(R.id.GameHintMax);
-                Hint.setText(hint);
-                HintMax.setText(hintMax.toString());
+
+
+                if(new_turnState == 0){
+                    //「ヒント入力」になったときは古いヒントを消す
+                    Hint.getEditableText().clear();
+                    HintMax.getEditableText().clear();
+                }else{
+                    //「カード選択」のときは新しいヒントを表示する
+                    Hint.setText(hint);
+                    HintMax.setText(hintMax.toString());
+                }
+
 
                 //操作できるかを判断する。
                 isActive = CheckActivity();