diff --git a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
index 88380abfe8b..dcde9739f60 100644
--- a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
+++ b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
@@ -13,7 +13,7 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) {
     class OrderManagementScreen extends ControlButtonsMixin(IndependentToOrderScreen) {
         constructor() {
             super(...arguments);
-            useListener('close-screen', this._close);
+            useListener('close-screen', this.close);
             useListener('set-numpad-mode', this._setNumpadMode);
             useListener('click-order', this._onClickOrder);
             useListener('next-page', this._onNextPage);
@@ -76,18 +76,8 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) {
             OrderFetcher.fetch();
         }
         _onClickOrder({ detail: clickedOrder }) {
-            let currentPOSOrder = this.env.pos.get_order();
-            if (currentPOSOrder && (!clickedOrder || clickedOrder.locked)) {
+            if (!clickedOrder || clickedOrder.locked) {
                 this.orderManagementContext.selectedOrder = clickedOrder;
-                if (clickedOrder.attributes.client){
-                    currentPOSOrder.set_client(clickedOrder.attributes.client);
-                }
-                if (clickedOrder.fiscal_position){
-                    currentPOSOrder.fiscal_position = clickedOrder.fiscal_position;
-                }
-                if (clickedOrder.pricelist){
-                    currentPOSOrder.set_pricelist(clickedOrder.pricelist);
-                }
             } else {
                 this._setOrder(clickedOrder);
             }
@@ -101,15 +91,6 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) {
                 this.close();
             }
         }
-        _close() {
-            let currentOrder = this.env.pos.get_order();
-            if (currentOrder){
-                currentOrder.set_client(false);
-                currentOrder.fiscal_position = false;
-                currentOrder.set_pricelist(this.env.pos.default_pricelist);
-            }
-            this.close();
-        }
     }
     OrderManagementScreen.template = 'OrderManagementScreen';
     OrderManagementScreen.hideOrderSelector = true;