diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d057adce7..757be10032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
+- Add `SaleTunnelNotValidated` step into `SaleTunnel`
 - Add WarningIcon component
 
 ### Changed
diff --git a/src/frontend/js/components/PaymentInterfaces/types.ts b/src/frontend/js/components/PaymentInterfaces/types.ts
index 33cbbb844e..1dda390e24 100644
--- a/src/frontend/js/components/PaymentInterfaces/types.ts
+++ b/src/frontend/js/components/PaymentInterfaces/types.ts
@@ -5,7 +5,6 @@ export enum PaymentErrorMessageId {
   ERROR_DEFAULT = 'errorDefault',
   ERROR_FULL_PRODUCT = 'errorFullProduct',
   ERROR_TERMS = 'errorTerms',
-  ERROR_POLLING_LIMIT = 'errorPollingLimit',
 }
 
 export enum PaymentProviders {
diff --git a/src/frontend/js/components/SaleTunnel/GenericPaymentButton/index.tsx b/src/frontend/js/components/SaleTunnel/GenericPaymentButton/index.tsx
index 6602bda2a0..e5a4f19242 100644
--- a/src/frontend/js/components/SaleTunnel/GenericPaymentButton/index.tsx
+++ b/src/frontend/js/components/SaleTunnel/GenericPaymentButton/index.tsx
@@ -33,13 +33,6 @@ const messages = defineMessages({
     description: 'Error message shown when payment creation request failed.',
     id: 'components.PaymentButton.errorDefault',
   },
-  errorPollingLimit: {
-    defaultMessage:
-      'Your payment has succeeded but your order validation is taking too long, you can close this dialog and come back later.',
-    description:
-      'Error message shown when the polling limit has been reached and the order is not yet validated.',
-    id: 'components.PaymentButton.errorPollingLimit',
-  },
   errorFullProduct: {
     defaultMessage: 'There are no more places available for this product.',
     description:
@@ -246,9 +239,7 @@ export const GenericPaymentButton = ({ buildOrderPayload }: Props) => {
     const checkOrderValidity = async () => {
       if (round >= PAYMENT_SETTINGS.pollLimit) {
         timeoutRef.current = undefined;
-        // @TODO Instead of displaying a raw error message, we could call onSuccess with a "special" argument
-        // to display a different message in the SaleTunnelSuccess component.
-        handleError(PaymentErrorMessageId.ERROR_POLLING_LIMIT);
+        onPaymentSuccessRef.current(false);
       } else {
         const isValidated = await isOrderValidated(payment!.order_id);
         if (isValidated) {
@@ -298,7 +289,7 @@ export const GenericPaymentButton = ({ buildOrderPayload }: Props) => {
     <>
       {renderTermsCheckbox()}
       <Button
-        disabled={isBusy || error === PaymentErrorMessageId.ERROR_POLLING_LIMIT}
+        disabled={isBusy}
         onClick={createOrder}
         data-testid={order && 'payment-button-order-loaded'}
         fullWidth={isMobile}
diff --git a/src/frontend/js/components/SaleTunnel/GenericSaleTunnel.tsx b/src/frontend/js/components/SaleTunnel/GenericSaleTunnel.tsx
index 4ea16603fc..4926c233f8 100644
--- a/src/frontend/js/components/SaleTunnel/GenericSaleTunnel.tsx
+++ b/src/frontend/js/components/SaleTunnel/GenericSaleTunnel.tsx
@@ -10,6 +10,7 @@ import { CourseProductEvent } from 'types/web-analytics';
 import { useOmniscientOrders, useOrders } from 'hooks/useOrders';
 import { SaleTunnelInformation } from 'components/SaleTunnel/SaleTunnelInformation';
 import { useEnrollments } from 'hooks/useEnrollments';
+import SaleTunnelNotValidated from './SaleTunnelNotValidated';
 
 export interface SaleTunnelContextType {
   props: SaleTunnelProps;
@@ -18,7 +19,7 @@ export interface SaleTunnelContextType {
   webAnalyticsEventKey: string;
 
   // internal
-  onPaymentSuccess: () => void;
+  onPaymentSuccess: (validated?: boolean) => void;
   step: SaleTunnelStep;
 
   // meta
@@ -46,6 +47,7 @@ export const useSaleTunnelContext = () => {
 export enum SaleTunnelStep {
   PAYMENT,
   SUCCESS,
+  NOT_VALIDATED,
 }
 
 interface GenericSaleTunnelProps extends SaleTunnelProps {
@@ -89,8 +91,12 @@ export const GenericSaleTunnel = (props: GenericSaleTunnelProps) => {
       setBillingAddress,
       creditCard,
       setCreditCard,
-      onPaymentSuccess: () => {
-        setStep(SaleTunnelStep.SUCCESS);
+      onPaymentSuccess: (validated: boolean = true) => {
+        if (validated) {
+          setStep(SaleTunnelStep.SUCCESS);
+        } else {
+          setStep(SaleTunnelStep.NOT_VALIDATED);
+        }
         WebAnalyticsAPIHandler()?.sendCourseProductEvent(
           CourseProductEvent.PAYMENT_SUCCEED,
           props.eventKey,
@@ -143,6 +149,8 @@ export const GenericSaleTunnelInner = (props: GenericSaleTunnelProps) => {
       return <GenericSaleTunnelPaymentStep {...props} />;
     case SaleTunnelStep.SUCCESS:
       return <GenericSaleTunnelSuccessStep {...props} />;
+    case SaleTunnelStep.NOT_VALIDATED:
+      return <GenericSaleTunnelNotValidatedStep {...props} />;
   }
   throw new Error('Invalid step: ' + step);
 };
@@ -187,7 +195,15 @@ export const GenericSaleTunnelPaymentStep = (props: GenericSaleTunnelProps) => {
 export const GenericSaleTunnelSuccessStep = (props: SaleTunnelProps) => {
   return (
     <Modal {...props} size={ModalSize.MEDIUM}>
-      <SaleTunnelSuccess closeModal={() => props.onClose()} />
+      <SaleTunnelSuccess closeModal={props.onClose} />
+    </Modal>
+  );
+};
+
+export const GenericSaleTunnelNotValidatedStep = (props: SaleTunnelProps) => {
+  return (
+    <Modal {...props} size={ModalSize.MEDIUM}>
+      <SaleTunnelNotValidated closeModal={props.onClose} />
     </Modal>
   );
 };
diff --git a/src/frontend/js/components/SaleTunnel/SaleTunnelNotValidated/index.tsx b/src/frontend/js/components/SaleTunnel/SaleTunnelNotValidated/index.tsx
new file mode 100644
index 0000000000..e09319e654
--- /dev/null
+++ b/src/frontend/js/components/SaleTunnel/SaleTunnelNotValidated/index.tsx
@@ -0,0 +1,70 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { Button } from '@openfun/cunningham-react';
+import { generatePath } from 'react-router-dom';
+import WarningIcon from 'components/WarningIcon';
+import { getDashboardBasename } from 'widgets/Dashboard/hooks/useDashboardRouter/getDashboardBasename';
+import { useSaleTunnelContext } from 'components/SaleTunnel/GenericSaleTunnel';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+import { ProductType } from 'types/Joanie';
+
+const messages = defineMessages({
+  apology: {
+    defaultMessage: "Sorry, you'll have to wait a little longer!",
+    description: 'Text displayed to thank user for his order',
+    id: 'components.SaleTunnelSuccessNotValidated.apology',
+  },
+  title: {
+    defaultMessage: 'It takes too long to validate your order.',
+    description: 'Message to confirm that order has been created',
+    id: 'components.SaleTunnelSuccessNotValidated.title',
+  },
+  description: {
+    defaultMessage:
+      'Your payment has succeeded but your order validation is taking too long, you can close this dialog and come back later. You will receive your invoice by email in a few moments.',
+    description: "Text to remind that order's invoice will be send by email soon",
+    id: 'components.SaleTunnelSuccessNotValidated.description',
+  },
+  cta: {
+    defaultMessage: 'Close',
+    description: 'Label to the call to action to close sale tunnel',
+    id: 'components.SaleTunnelSuccessNotValidated.cta',
+  },
+});
+
+const SaleTunnelNotValidated = ({ closeModal }: { closeModal: () => void }) => {
+  const intl = useIntl();
+  const { order, product } = useSaleTunnelContext();
+  return (
+    <section className="sale-tunnel-end" data-testid="generic-sale-tunnel-not-validated-step">
+      <header className="sale-tunnel-end__header">
+        <WarningIcon />
+        <h3 className="sale-tunnel-end__title">
+          <FormattedMessage {...messages.apology} />
+        </h3>
+      </header>
+      <p className="sale-tunnel-end__content">
+        <FormattedMessage {...messages.title} />
+        <br />
+        <FormattedMessage {...messages.description} />
+      </p>
+      <footer className="sale-tunnel-end__footer">
+        {product.type === ProductType.CREDENTIAL ? (
+          <Button
+            href={
+              getDashboardBasename(intl.locale) +
+              generatePath(LearnerDashboardPaths.ORDER, { orderId: order!.id })
+            }
+          >
+            <FormattedMessage {...messages.cta} />
+          </Button>
+        ) : (
+          <Button onClick={closeModal}>
+            <FormattedMessage {...messages.cta} />
+          </Button>
+        )}
+      </footer>
+    </section>
+  );
+};
+
+export default SaleTunnelNotValidated;
diff --git a/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/_styles.scss b/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/_styles.scss
deleted file mode 100644
index d81cfb4146..0000000000
--- a/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/_styles.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// SaleTunnelStepResume component styles
-//
-
-//
-// Mixins
-//
-
-//
-// keyframe-strokedLineAppear
-//
-// Generate a keyframe to make svg stroked element appears slightly
-//
-// @param {string}  name     the keyframe's name to use from `animation`
-// @param {length}  length   the full length of the stroke line`
-// @param {reverse} reverse  animation direction`
-@mixin keyframe-strokedLineAppear($name, $length, $reverse: false) {
-  $direction: 1;
-  @if $reverse == true {
-    $direction: -1;
-  }
-
-  @keyframes #{$name} {
-    from {
-      stroke-dashoffset: $direction * $length;
-    }
-    to {
-      stroke-dashoffset: 0;
-    }
-  }
-}
-
-//
-// Styles
-//
-.SaleTunnelSuccess {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-
-  &__header {
-    margin-bottom: 0;
-    text-align: center;
-  }
-
-  &__title {
-    color: r-theme-val(steps-content, title-color);
-    font-size: 1.5rem;
-  }
-
-  &__content {
-    color: r-theme-val(steps-content, content-color);
-    font-size: 0.875rem;
-    line-height: 1.3em;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-  }
-
-  &__footer {
-    margin-top: 2.5rem;
-  }
-}
diff --git a/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/index.tsx b/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/index.tsx
index 1d2545de03..4c6d601b26 100644
--- a/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/index.tsx
+++ b/src/frontend/js/components/SaleTunnel/SaleTunnelSuccess/index.tsx
@@ -10,33 +10,33 @@ const messages = defineMessages({
   congratulations: {
     defaultMessage: 'Congratulations!',
     description: 'Text displayed to thank user for his order',
-    id: 'components.SaleTunnelStepResume.congratulations',
+    id: 'components.SaleTunnelSuccess.congratulations',
   },
   successMessage: {
     defaultMessage: 'Your order has been successfully created.',
     description: 'Message to confirm that order has been created',
-    id: 'components.SaleTunnelStepResume.successMessage',
+    id: 'components.SaleTunnelSuccess.successMessage',
   },
   successDetailMessage: {
     defaultMessage: 'You will receive your invoice by email in a few moments.',
     description: "Text to remind that order's invoice will be send by email soon",
-    id: 'components.SaleTunnelStepResume.successDetailMessage',
+    id: 'components.SaleTunnelSuccess.successDetailMessage',
   },
   successDetailSignatureMessage: {
     defaultMessage:
       'In order to enroll to course runs you first need to sign the training contract.',
     description: 'Text to remind that order needs to be signed',
-    id: 'components.SaleTunnelStepResume.successDetailSignatureMessage',
+    id: 'components.SaleTunnelSuccess.successDetailSignatureMessage',
   },
   cta: {
     defaultMessage: 'Start this course now!',
     description: 'Label to the call to action to close sale tunnel',
-    id: 'components.SaleTunnelStepResume.cta',
+    id: 'components.SaleTunnelSuccess.cta',
   },
   ctaSignature: {
     defaultMessage: 'Sign the training contract',
     description: 'Label to the call to action to close sale tunnel if there is a pending signature',
-    id: 'components.SaleTunnelStepResume.ctaSignature',
+    id: 'components.SaleTunnelSuccess.ctaSignature',
   },
 });
 
@@ -44,14 +44,14 @@ export const SaleTunnelSuccess = ({ closeModal }: { closeModal: () => void }) =>
   const intl = useIntl();
   const { order, product } = useSaleTunnelContext();
   return (
-    <section className="SaleTunnelSuccess" data-testid="generic-sale-tunnel-success-step">
-      <header className="SaleTunnelSuccess__header">
+    <section className="sale-tunnel-end" data-testid="generic-sale-tunnel-success-step">
+      <header className="sale-tunnel-end__header">
         <SuccessIcon />
-        <h3 className="SaleTunnelSuccess__title">
+        <h3 className="sale-tunnel-end__title">
           <FormattedMessage {...messages.congratulations} />
         </h3>
       </header>
-      <p className="SaleTunnelSuccess__content">
+      <p className="sale-tunnel-end__content">
         <FormattedMessage {...messages.successMessage} />
         <br />
         <FormattedMessage {...messages.successDetailMessage} />
@@ -62,7 +62,7 @@ export const SaleTunnelSuccess = ({ closeModal }: { closeModal: () => void }) =>
           </>
         )}
       </p>
-      <footer className="SaleTunnelSuccess__footer">
+      <footer className="sale-tunnel-end__footer">
         {product.contract_definition ? (
           <Button
             href={
diff --git a/src/frontend/js/components/SaleTunnel/_styles.scss b/src/frontend/js/components/SaleTunnel/_styles.scss
index b1f941ba21..147ec5bb96 100644
--- a/src/frontend/js/components/SaleTunnel/_styles.scss
+++ b/src/frontend/js/components/SaleTunnel/_styles.scss
@@ -102,3 +102,32 @@
   font-weight: var(--c--theme--font--weights--bold);
   text-align: left;
 }
+
+.sale-tunnel-end {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+
+  &__header {
+    margin-bottom: 0;
+    text-align: center;
+  }
+
+  &__title {
+    color: r-theme-val(steps-content, title-color);
+    font-size: 1.5rem;
+  }
+
+  &__content {
+    color: r-theme-val(steps-content, content-color);
+    font-size: 0.875rem;
+    line-height: 1.3em;
+    margin: 0;
+    padding: 0;
+    text-align: center;
+  }
+
+  &__footer {
+    margin-top: 2.5rem;
+  }
+}
diff --git a/src/frontend/js/components/SaleTunnel/index.spec.tsx b/src/frontend/js/components/SaleTunnel/index.spec.tsx
index 9e345484fd..38369d10ef 100644
--- a/src/frontend/js/components/SaleTunnel/index.spec.tsx
+++ b/src/frontend/js/components/SaleTunnel/index.spec.tsx
@@ -455,7 +455,7 @@ describe.each([
       expect(fetchMock.calls()).toHaveLength(nbApiCalls);
     });
 
-    it('should display an error message if order is not validated after a given delay', async () => {
+    it('should render SaleTunnelNotValidated if order is not validated after a given delay', async () => {
       const product = ProductFactory().one();
       const billingAddress = AddressFactory({
         is_main: true,
@@ -548,6 +548,7 @@ describe.each([
       screen.getByText('Payment in progress');
 
       fetchMock.resetHistory();
+      nbApiCalls = 0;
       // - Wait until order has been polled 29 times.
       await act(async () => {
         await jest.advanceTimersByTimeAsync(
@@ -557,21 +558,40 @@ describe.each([
 
       await waitFor(async () => {
         expect(fetchMock.calls()).toHaveLength(PAYMENT_SETTINGS.pollLimit - 1);
+        nbApiCalls += PAYMENT_SETTINGS.pollLimit - 1;
       });
 
       // - This round should be the last
       await act(async () => {
         jest.runOnlyPendingTimers();
+        nbApiCalls += 1; // last poll round
       });
 
-      // - An error message should be displayed and focused (for screen reader users)
-      const $error = screen.getByText(
-        'Your payment has succeeded but your order validation is taking too long, you can close this dialog and come back later.',
-      );
-      expect(document.activeElement).toBe($error);
+      nbApiCalls += 1; // useProductOrder call (invalidate)
+      nbApiCalls += 1; // orders get (invalidate queries)
 
-      // - Payment button should be disabled
-      expect($button.disabled).toBe(true);
+      // - The SaleTunnelNotValidated component should be rendered
+      screen.getByTestId('generic-sale-tunnel-not-validated-step');
+      screen.getByText("Sorry, you'll have to wait a little longer!");
+
+      // If productType is credential, the button should redirect to the dashboard
+      if (productType === ProductType.CREDENTIAL) {
+        const $link = screen.getByRole('link', {
+          name: 'Close',
+        });
+        expect($link.getAttribute('href')).toBe(`/en/dashboard/courses/orders/${order.id}`);
+      } else {
+        // Otherwise, the button should close the modal
+        screen.getByRole('button', {
+          name: 'Close',
+        });
+      }
+
+      // - And poller should be stopped
+      await act(async () => {
+        jest.runOnlyPendingTimers();
+      });
+      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
     }, 10000);
 
     it('should render an error message when payment failed', async () => {
diff --git a/src/frontend/scss/components/_index.scss b/src/frontend/scss/components/_index.scss
index 69af0165df..edd7b72b49 100644
--- a/src/frontend/scss/components/_index.scss
+++ b/src/frontend/scss/components/_index.scss
@@ -11,7 +11,6 @@
 @import '../../js/components/SaleTunnel/CreditCardSelector/styles';
 @import '../../js/components/SaleTunnel/ProductPath/styles';
 @import '../../js/components/SaleTunnel/Sponsors/SaleTunnelSponsors';
-@import '../../js/components/SaleTunnel/SaleTunnelSuccess/styles';
 @import '../../js/components/SuccessIcon/styles';
 @import '../../js/components/WarningIcon/styles';
 @import '../../js/components/RegisteredAddress/styles';