diff --git a/android/src/main/java/com/tailscale/ipn/Peer.java b/android/src/main/java/com/tailscale/ipn/Peer.java
index 5260f07..6ec8a08 100644
--- a/android/src/main/java/com/tailscale/ipn/Peer.java
+++ b/android/src/main/java/com/tailscale/ipn/Peer.java
@@ -35,6 +35,8 @@ public class Peer extends Fragment {
 				GoogleSignInAccount acc = GoogleSignIn.getLastSignedInAccount(getActivity());
 				onSignin(acc.getIdToken());
 				return;
+			} else {
+				onSignin(null);
 			}
 		case REQUEST_PREPARE_VPN:
 			if (resultCode == Activity.RESULT_OK) {
diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go
index e57ce65..36f5ec3 100644
--- a/cmd/tailscale/main.go
+++ b/cmd/tailscale/main.go
@@ -435,12 +435,14 @@ func (a *App) runUI() error {
 			requestBackend(ConnectEvent{Enable: false})
 		case tok := <-onGoogleToken:
 			ui.signinType = noSignin
-			requestBackend(OAuth2Event{
-				Token: &oauth2.Token{
-					AccessToken: tok,
-					TokenType:   ipn.GoogleIDTokenType,
-				},
-			})
+			if tok != "" {
+				requestBackend(OAuth2Event{
+					Token: &oauth2.Token{
+						AccessToken: tok,
+						TokenType:   ipn.GoogleIDTokenType,
+					},
+				})
+			}
 		case <-a.updates:
 			a.mu.Lock()
 			oldState := state.backend.State