diff --git a/packages/manager/apps/container/src/identity-documents-modal/IdentityDocumentsModal.tsx b/packages/manager/apps/container/src/identity-documents-modal/IdentityDocumentsModal.tsx
index 4ddc87d49bf6..e20edcd25c99 100644
--- a/packages/manager/apps/container/src/identity-documents-modal/IdentityDocumentsModal.tsx
+++ b/packages/manager/apps/container/src/identity-documents-modal/IdentityDocumentsModal.tsx
@@ -52,6 +52,7 @@ export const IdentityDocumentsModal: FunctionComponent = () => {
     setStorage(true);
     trackingPlugin.trackClick({
       name: `${trackingPrefix}::pop-up::link::kyc::cancel`,
+      type: 'action',
       ...trackingContext,
     });
   };
diff --git a/packages/manager/apps/container/src/payment-modal/PaymentModal.tsx b/packages/manager/apps/container/src/payment-modal/PaymentModal.tsx
index 89eeffa58251..846410156c82 100644
--- a/packages/manager/apps/container/src/payment-modal/PaymentModal.tsx
+++ b/packages/manager/apps/container/src/payment-modal/PaymentModal.tsx
@@ -35,8 +35,8 @@ interface IPaymentMethod {
   paymentMethodId: number;
 }
 
-const computeAlert = (paymentMethods: IPaymentMethod[]): string => {
-  const currentCreditCard: IPaymentMethod = paymentMethods?.find(currentPaymentMethod => currentPaymentMethod.paymentType === 'CREDIT_CARD'
+const computeAlert = (paymentMethods: IPaymentMethod[] =[]): string => {
+  const currentCreditCard: IPaymentMethod = paymentMethods.find(currentPaymentMethod => currentPaymentMethod.paymentType === 'CREDIT_CARD'
   && currentPaymentMethod.default);
 
   if (currentCreditCard) {
@@ -83,19 +83,16 @@ const PaymentModal = (): JSX.Element => {
   });
 
   useEffect(() => {
-    if (paymentResponse) {
-      const alert = computeAlert(paymentResponse.data);
+    if (isReadyToRequest && !isLoading) {
+      const alert = computeAlert(paymentResponse?.data);
       if (alert) {
         setAlert(alert);
         setShowPaymentModal(true);
       }
-      else if (isReadyToRequest) {
+      else {
         shell.getPlugin('ux').notifyModalActionDone();
       }
     }
-    else if (isReadyToRequest && !isLoading) {
-      shell.getPlugin('ux').notifyModalActionDone();
-    }
   }, [paymentResponse, isReadyToRequest, isLoading]);
 
   return !showPaymentModal ? (