diff --git a/packages/auth/src/OAuth/OAuth.ts b/packages/auth/src/OAuth/OAuth.ts
index fd83dfe0462..c5537f603ec 100644
--- a/packages/auth/src/OAuth/OAuth.ts
+++ b/packages/auth/src/OAuth/OAuth.ts
@@ -72,7 +72,7 @@ export default class OAuth {
     const generatedState = this._generateState(32);
     const state = customState ? `${generatedState}-${customState}` : generatedState;
 
-    oAuthStorage.setState(state);
+    oAuthStorage.setState(encodeURIComponent(state));
 
     const pkce_key = this._generateRandom(128);
     oAuthStorage.setPKCE(pkce_key);