diff --git a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
index 981773d9d03a6c..f3e9e879b30468 100644
--- a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
@@ -195,8 +195,16 @@ public void render(
 			HttpServletResponse httpServletResponse)
 		throws Exception {
 
+			CommerceOrder commerceOrder =
+			(CommerceOrder)httpServletRequest.getAttribute(
+				CommerceCheckoutWebKeys.COMMERCE_ORDER);
+
+			httpServletRequest.setAttribute(
+			"orderId", commerceOrder.getCommerceOrderId());
+			
 		httpServletRequest.setAttribute(
 			CommerceClientExtensionWebKeys.RENDER_URL, _baseURL + "/index.js");
+			
 
 		if (Validator.isNotNull(_paymentMethodKey)) {
 			_renderPayment(httpServletRequest);
@@ -278,4 +286,4 @@ private void _renderPayment(HttpServletRequest httpServletRequest)
 	private final UserService _userService;
 	private final boolean _visible;
 
-}
\ No newline at end of file
+}