diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f373ac..c23c88e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ The current file describes significant changes in the code that may affect the u
 
 ## Changes in the Сommerce-Demo-Checkouts package versions
 
+### UNRELEASED
+
+#### Removed
+* Deprecated `Oro\Bundle\AlternativeCheckoutBundle\EventListener\QuantityToOrderConditionListener`. Will be moved to the validation.yml config instead.
+
 ### 4.2.0 (2020-01-29)
 
 OroAlternativeCheckoutBundle has been moved from the `oro/commerce` package to the `oro/commerce-demo-checkouts` package.
diff --git a/src/Oro/Bundle/AlternativeCheckoutBundle/Resources/config/oro/workflows.yml b/src/Oro/Bundle/AlternativeCheckoutBundle/Resources/config/oro/workflows.yml
index 1950129..30993ad 100644
--- a/src/Oro/Bundle/AlternativeCheckoutBundle/Resources/config/oro/workflows.yml
+++ b/src/Oro/Bundle/AlternativeCheckoutBundle/Resources/config/oro/workflows.yml
@@ -1144,6 +1144,13 @@ workflows:
 
             place_order_definition:
                 preactions:
+                    - '@run_action_group':
+                          action_group: order_line_items_not_empty
+                          parameters_mapping:
+                              checkout: $checkout
+                          results:
+                              result.orderLineItemsNotEmpty: $.orderLineItemsNotEmpty
+                              result.orderLineItemsNotEmptyForRfp: $.orderLineItemsNotEmptyForRfp
                     - '@flash_message':
                         conditions:
                             '@and':
@@ -1215,6 +1222,13 @@ workflows:
 
                 preconditions:
                     '@and':
+                        - '@equal': [$checkout.completed, false]
+                        - '@equal':
+                              parameters: [$.result.orderLineItemsNotEmptyForRfp, true]
+                              message: oro.checkout.workflow.condition.order_line_items_not_empty.not_allow_rfp.message
+                        - '@equal':
+                              parameters: [$.result.orderLineItemsNotEmpty, true]
+                              message: oro.checkout.workflow.condition.order_line_items_not_empty.allow_rfp.message
                         - '@not_empty': $.result.paymentContext
                         - '@equal':
                             parameters: [$.result.shippingMethodHasEnabledShippingRules, true]