diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
index ee2eb37..a8cf9a2 100644
--- a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
+++ b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
@@ -27,7 +27,7 @@ public class GoogleAuth extends Plugin {
   @Override
   public void load() {
     String clientId = this.getContext().getString(R.string.server_client_id);
-    Boolean forceCodeForRefreshToken = false;
+    boolean forceCodeForRefreshToken = false;
 
     Boolean forceRefreshToken = (Boolean) getConfigValue("forceCodeForRefreshToken");
     if (forceRefreshToken != null) {
@@ -36,9 +36,12 @@ public void load() {
 
     GoogleSignInOptions.Builder googleSignInBuilder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestIdToken(clientId)
-            .requestServerAuthCode(clientId, forceCodeForRefreshToken)
             .requestEmail();
 
+    if (forceCodeForRefreshToken) {
+      googleSignInBuilder.requestServerAuthCode(clientId, true);
+    }
+
     try {
       JSONArray scopeArray = (JSONArray) getConfigValue("scopes");
       Scope[] scopes = new Scope[scopeArray.length() - 1];