diff --git a/static/gsApp/views/amCheckout/components/cart.spec.tsx b/static/gsApp/views/amCheckout/components/cart.spec.tsx
index b7272d02c691fd..a1f0512e7261ca 100644
--- a/static/gsApp/views/amCheckout/components/cart.spec.tsx
+++ b/static/gsApp/views/amCheckout/components/cart.spec.tsx
@@ -457,6 +457,7 @@ describe('Cart', () => {
         },
         name: 'partner',
       },
+      paymentSource: null,
     });
 
     render(
@@ -471,7 +472,9 @@ describe('Cart', () => {
     );
 
     // wait for preview to be loaded
-    await screen.findByRole('button', {name: 'Confirm and pay'});
+    await waitFor(() =>
+      expect(screen.getByRole('button', {name: 'Confirm and pay'})).toBeEnabled()
+    );
     screen.getByText(/you will be billed by Partner/);
   });
 
diff --git a/static/gsApp/views/amCheckout/utils.tsx b/static/gsApp/views/amCheckout/utils.tsx
index 601742574f05cc..ff1a900877660e 100644
--- a/static/gsApp/views/amCheckout/utils.tsx
+++ b/static/gsApp/views/amCheckout/utils.tsx
@@ -899,6 +899,10 @@ export function hasBillingInfo(
   subscription: Subscription,
   isComplete: boolean
 ) {
+  if (subscription.isSelfServePartner) {
+    return true;
+  }
+
   if (isComplete) {
     return !!subscription.paymentSource && hasSomeBillingDetails(billingDetails);
   }