diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
index 64a5c94..e692ebf 100644
--- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
@@ -17,6 +17,8 @@
 import com.example.tampopo_client.Tampopo;
 import com.example.tampopo_client.viewmodels.UserViewModel;
 
+import androidx.lifecycle.Observer;
+
 public class LoginActivity extends AppCompatActivity {
 
   UserViewModel userViewModel;
@@ -40,6 +42,17 @@
           }
         });
 
+    userViewModel.getToken().observe(this, new Observer<String>() {
+      @Override
+      public void onChanged(String token) {
+        if (token != null){
+          ((Tampopo) LoginActivity.this.getApplication()).setToken(token);
+          Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+          startActivity(intent);
+        }
+      }
+    });
+
     Button button_login = (Button) findViewById(R.id.loginbutton);
     button_login.setOnClickListener(new OnClickListener() {
 
@@ -52,13 +65,8 @@
         String password = passwordInput.getText().toString();
         userViewModel.login(userid, password);
 
-        userViewModel.getToken().getValue();
-        //TODO:上記のトークンを使ってTampopoクラスにセットするコードを書く
-        //((Tampopo)this.getApplication).setToken(token);
 
 
-        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-        startActivity(intent);
 
       }
     });