diff --git a/src/ApiClient.js b/src/ApiClient.js
index 91f32fdb7..1b022a66d 100644
--- a/src/ApiClient.js
+++ b/src/ApiClient.js
@@ -732,7 +732,7 @@
       "&scope=" + formattedScopes +
       "&client_id="+ clientId +
       "&redirect_uri=" + encodeURIComponent(redirectUri) +
-      (state ? "&state=" + state : '');
+      (state ? "&state=" + encodeURIComponent(state) : '');
   };
 
   /**