diff --git a/cypress/e2e/orders/orders.js b/cypress/e2e/orders/orders.js
index f4fb5b3fa..874916e6a 100644
--- a/cypress/e2e/orders/orders.js
+++ b/cypress/e2e/orders/orders.js
@@ -127,17 +127,9 @@ describe("Orders", () => {
     "should create order with selected channel. TC: SALEOR_2104",
     { tags: ["@orders", "@allEnv", "@stable", "@oldRelease"] },
     () => {
-      cy.visit(urlList.orders)
-        .get(ORDERS_SELECTORS.createOrder)
-        .click();
+      cy.visit(urlList.orders).get(ORDERS_SELECTORS.createOrder).click();
       selectChannelInPicker(defaultChannel.name);
-      finalizeDraftOrder(randomName, address).then(draftOrderNumber => {
-        cy.visit(urlList.orders);
-        cy.contains(ORDERS_SELECTORS.orderRow, draftOrderNumber).click();
-        cy.contains(ORDERS_SELECTORS.salesChannel, defaultChannel.name).should(
-          "be.visible",
-        );
-      });
+      finalizeDraftOrder(randomName, address);
     },
   );
 
diff --git a/cypress/elements/orders/draft-order-selectors.js b/cypress/elements/orders/draft-order-selectors.js
index b54ef68b1..7a769a547 100644
--- a/cypress/elements/orders/draft-order-selectors.js
+++ b/cypress/elements/orders/draft-order-selectors.js
@@ -9,4 +9,5 @@ export const DRAFT_ORDER_SELECTORS = {
   editShippingAddress: '[data-test-id="edit-shipping-address"]',
   editBillingAddress: '[data-test-id="edit-billing-address"]',
   customerEmail: '[data-test-id="customer-email"]',
+  newAddressSelectButton: "[data-test-id='customerAddressnewAddress']",
 };
diff --git a/cypress/support/pages/draftOrderPage.js b/cypress/support/pages/draftOrderPage.js
index 0392eddb2..ecccf2ae5 100644
--- a/cypress/support/pages/draftOrderPage.js
+++ b/cypress/support/pages/draftOrderPage.js
@@ -16,12 +16,14 @@ export function finalizeDraftOrder(name) {
       matchCase: false,
     })
     .click()
+    .get(DRAFT_ORDER_SELECTORS.newAddressSelectButton)
+    .should("be.visible")
+    .get(BUTTON_SELECTORS.submit)
+    .click()
     .get(DRAFT_ORDER_SELECTORS.customerEmail)
     .should("be.visible")
     .get(SHARED_ELEMENTS.skeleton)
     .should("not.exist")
-    .get(BUTTON_SELECTORS.submit)
-    .click()
     .get(DRAFT_ORDER_SELECTORS.addShippingCarrierLink)
     .click()
     .get(SELECT_SHIPPING_METHOD_FORM.selectShippingMethod)