diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res
index 1bd4408ff..f234d0b43 100644
--- a/src/Payments/ApplePay.res
+++ b/src/Payments/ApplePay.res
@@ -1,7 +1,7 @@
 type props = {sessionObj: option<Js.Json.t>, list: PaymentMethodListType.list}
 
 let default = (props: props) => {
-  let {clientSecret, publishableKey} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
+  let {publishableKey} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
   let (showApplePay, setShowApplePay) = React.useState(() => false)
   let (showApplePayLoader, setShowApplePayLoader) = React.useState(() => false)
   let intent = PaymentHelpers.usePaymentIntent(None, Applepay)
diff --git a/src/Payments/GPay.res b/src/Payments/GPay.res
index a32acb090..b03cfb673 100644
--- a/src/Payments/GPay.res
+++ b/src/Payments/GPay.res
@@ -19,7 +19,7 @@ external resToJson: Fetch.Response.t => Js.Json.t = "%identity"
 let default = (props: props) => {
   let (loggerState, _setLoggerState) = Recoil.useRecoilState(loggerAtom)
   let {iframeId} = Recoil.useRecoilValueFromAtom(keys)
-  let {clientSecret, publishableKey} = Recoil.useRecoilValueFromAtom(keys)
+  let {publishableKey} = Recoil.useRecoilValueFromAtom(keys)
   let options = Recoil.useRecoilValueFromAtom(optionAtom)
   let intent = PaymentHelpers.usePaymentIntent(Some(loggerState), Gpay)
   let sync = PaymentHelpers.usePaymentSync(Some(loggerState), Gpay)
diff --git a/src/Payments/PayPal.res b/src/Payments/PayPal.res
index 7583b2097..b12909fee 100644
--- a/src/Payments/PayPal.res
+++ b/src/Payments/PayPal.res
@@ -14,7 +14,7 @@ let payPalIcon = <Icon size=35 width=90 name="paypal" />
 let default = (props: props) => {
   let loggerState = Recoil.useRecoilValueFromAtom(loggerAtom)
   let (paypalClicked, setPaypalClicked) = React.useState(_ => false)
-  let {clientSecret, publishableKey} = Recoil.useRecoilValueFromAtom(keys)
+  let {publishableKey} = Recoil.useRecoilValueFromAtom(keys)
   let options = Recoil.useRecoilValueFromAtom(optionAtom)
   let (_, _, labelType) = options.wallets.style.type_
   let _label = switch labelType {
diff --git a/src/Payments/PaymentRequestButtonElement.res b/src/Payments/PaymentRequestButtonElement.res
index cb8c6a44b..2f632836b 100644
--- a/src/Payments/PaymentRequestButtonElement.res
+++ b/src/Payments/PaymentRequestButtonElement.res
@@ -28,40 +28,49 @@ let make = (~sessions, ~walletOptions, ~list) => {
     Gpay,
   )
 
+  let {clientSecret} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
+
   <div className="flex flex-col gap-1 h-auto w-full max-w-[750px]">
     {walletOptions
     ->Js.Array2.mapi((item, i) => {
       <React.Suspense fallback={<WalletShimmer />} key={i->Belt.Int.toString}>
-        {switch item->paymentMode {
-        | GPayWallet =>
-          <SessionPaymentWrapper type_={Wallet}>
-            {switch gPayToken {
-            | OtherTokenOptional(optToken) =>
-              switch googlePayThirdPartyToken {
-              | GooglePayThirdPartyTokenOptional(googlePayThirdPartyOptToken) => <GPayLazy sessionObj=optToken list thirdPartySessionObj=googlePayThirdPartyOptToken />
-              | _ => <GPayLazy sessionObj=optToken list thirdPartySessionObj=None />
-              }
+        {switch clientSecret {
+        | Some(_) =>
+          switch item->paymentMode {
+          | GPayWallet =>
+            <SessionPaymentWrapper type_={Wallet}>
+              {switch gPayToken {
+              | OtherTokenOptional(optToken) =>
+                switch googlePayThirdPartyToken {
+                | GooglePayThirdPartyTokenOptional(googlePayThirdPartyOptToken) =>
+                  <GPayLazy
+                    sessionObj=optToken list thirdPartySessionObj=googlePayThirdPartyOptToken
+                  />
+                | _ => <GPayLazy sessionObj=optToken list thirdPartySessionObj=None />
+                }
+              | _ => React.null
+              }}
+            </SessionPaymentWrapper>
+          | PaypalWallet =>
+            <SessionPaymentWrapper type_={Wallet}>
+              {switch paypalToken {
+              | OtherTokenOptional(optToken) =>
+                switch optToken {
+                | Some(token) => <PaypalSDKLazy sessionObj=token list />
+                | None => <PayPalLazy list />
+                }
+              | _ => <PayPalLazy list />
+              }}
+            </SessionPaymentWrapper>
+          | ApplePayWallet =>
+            switch applePayToken {
+            | ApplePayTokenOptional(optToken) => <ApplePayLazy sessionObj=optToken list />
             | _ => React.null
-            }}
-          </SessionPaymentWrapper>
-        | PaypalWallet =>
-          <SessionPaymentWrapper type_={Wallet}>
-            {switch paypalToken {
-            | OtherTokenOptional(optToken) =>
-              switch optToken {
-              | Some(token) => <PaypalSDKLazy sessionObj=token list />
-              | None => <PayPalLazy list />
-              }
-            | _ => <PayPalLazy list />
-            }}
-          </SessionPaymentWrapper>
-        | ApplePayWallet =>
-          switch applePayToken {
-          | ApplePayTokenOptional(optToken) => <ApplePayLazy sessionObj=optToken list />
-          | _ => React.null
-          }
+            }
 
-        | NONE => React.null
+          | NONE => React.null
+          }
+        | None => React.null
         }}
       </React.Suspense>
     })
diff --git a/src/Payments/PaypalSDK.res b/src/Payments/PaypalSDK.res
index dae35798d..5a37cc4f1 100644
--- a/src/Payments/PaypalSDK.res
+++ b/src/Payments/PaypalSDK.res
@@ -4,7 +4,7 @@ open RecoilAtoms
 type props = {sessionObj: SessionsType.token, list: PaymentMethodListType.list}
 
 let default = (props: props) => {
-  let {iframeId, clientSecret, publishableKey} = Recoil.useRecoilValueFromAtom(keys)
+  let {iframeId, publishableKey} = Recoil.useRecoilValueFromAtom(keys)
   let (loggerState, _setLoggerState) = Recoil.useRecoilState(loggerAtom)
 
   let token = props.sessionObj.token