diff --git a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
index 59de980fa2c..395f4431efa 100644
--- a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
+++ b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
@@ -41,13 +41,14 @@ export class OrderWidget extends Component {
         const payAfter = this.selfOrder.config.self_ordering_pay_after;
         const kioskPayment = this.selfOrder.pos_payment_methods;
         const isNoLine = this.selfOrder.currentOrder.lines.length === 0;
+        const hasNotAllLinesSent = this.selfOrder.currentOrder.hasNotAllLinesSent();
 
         let label = "";
         let disabled = false;
 
         if (currentPage === "product_list") {
             label = _t("Order");
-            disabled = isNoLine;
+            disabled = isNoLine || hasNotAllLinesSent.length == 0;
         } else if (payAfter === "meal" && !this.selfOrder.currentOrder.isSavedOnServer) {
             label = _t("Order");
             disabled = isNoLine;
@@ -61,15 +62,8 @@ export class OrderWidget extends Component {
 
     get lineNotSend() {
         const order = this.selfOrder.currentOrder;
-
-        if (order.isSavedOnServer) {
-            return {
-                price: order.amount_total,
-                count: order.totalQuantity,
-            };
-        }
-
         const lineNotSend = order.hasNotAllLinesSent();
+
         return lineNotSend.reduce(
             (acc, line) => {
                 const currentQty = line.qty;
diff --git a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.xml b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.xml
index cd9e3bc6391..228757bfd28 100644
--- a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.xml
+++ b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.xml
@@ -12,8 +12,7 @@
             <button t-attf-class="btn btn-secondary btn-lg d-none d-sm-inline text-nowrap" t-on-click="onClickleftButton" t-esc="leftButton.name" />
             <div class="d-flex align-items-center flex-grow-1 w-100 w-md-auto">
                 <div class="to-order">
-                    <span t-if="!this.selfOrder.currentOrder.isSavedOnServer">To Order</span>
-                    <span t-else="">To Pay</span>
+                    <span>To Order</span>
                     <div class="d-flex align-items-center">
                         <span class="o-so-tabular-nums badge text-bg-secondary rounded" t-esc="lineNotSend.count"/>
                         <span class="o-so-tabular-nums mx-2" t-if="selfOrder.currentOrder.lines.length" t-esc="selfOrder.formatMonetary(lineNotSend.price)" />
diff --git a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
index 3909dbe850b..6901d6ebbcd 100644
--- a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
+++ b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
@@ -52,6 +52,7 @@ export class CartPage extends Component {
         const type = this.selfOrder.config.self_ordering_mode;
         const takeAway = this.selfOrder.currentOrder.take_away;
         const mode = this.selfOrder.config.self_ordering_pay_after;
+        const isOnlinePayment = this.selfOrder.pos_payment_methods.find((p) => p.is_online_payment);
         const order = this.selfOrder.currentOrder;
         const isPaymentMethod = this.selfOrder.pos_payment_methods.length > 0;