diff --git a/src/pages/OnboardingSuccess.tsx b/src/pages/OnboardingSuccess.tsx
index 67c4da5..30ab8eb 100644
--- a/src/pages/OnboardingSuccess.tsx
+++ b/src/pages/OnboardingSuccess.tsx
@@ -64,7 +64,7 @@ const OnboardingSuccess = () => {
       setLoading(false);
     };
 
-    if (cosmosAddress) {
+    if (cosmosAddress && ENABLE_KYC) {
       getToken(cosmosAddress).catch(error => {
         console.error(error);
         alert("Failed to fetch token");
diff --git a/src/pages/SignWithNitroKey.tsx b/src/pages/SignWithNitroKey.tsx
index 625f4cf..3580ee3 100644
--- a/src/pages/SignWithNitroKey.tsx
+++ b/src/pages/SignWithNitroKey.tsx
@@ -69,6 +69,7 @@ const SignWithNitroKey = () => {
           });
         } else {
           const kycIdHash = ethers.utils.sha256(ethers.utils.toUtf8Bytes(cosmosAddress));
+
           navigate("/sign-with-cosmos", {
             state: {
               message,