diff --git a/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java b/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java
index 58f3cdb..6d50809 100644
--- a/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java
@@ -114,12 +114,12 @@
                     app.setIcon(changeIconUrl);
                 }
 
-                if(usernicknameInput == null){
+                if (usernicknameInput == null  && changeIconUrl == null) {
+                    Toast.makeText(UserInfoActivity.this, "ニックネームとアイコンを設定してください", Toast.LENGTH_SHORT).show();
+                }else if(usernicknameInput == null){
                     Toast.makeText(UserInfoActivity.this, "ニックネームを入力してください", Toast.LENGTH_SHORT).show();
                 } else if (changeIconUrl == null) {
                     Toast.makeText(UserInfoActivity.this, "アイコンを設定してください", Toast.LENGTH_SHORT).show();
-                } else if (usernicknameInput == null && changeIconUrl == null) {
-                    Toast.makeText(UserInfoActivity.this, "ニックネームとアイコンを設定してください", Toast.LENGTH_SHORT).show();
                 }else {
                     //メイン画面に進む
                     Intent intent = new Intent(UserInfoActivity.this, MainActivity.class);