diff --git a/pos_receipt_extend/static/src/js/payment.js b/pos_receipt_extend/static/src/js/payment.js
index 0e33fd208..fc02e1c54 100755
--- a/pos_receipt_extend/static/src/js/payment.js
+++ b/pos_receipt_extend/static/src/js/payment.js
@@ -55,9 +55,7 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) {
                 }).then(function(result){
                 const address = `${result.base_url}/my/invoices/${result.invoice_id}?`
                 let qr_code_svg = new XMLSerializer().serializeToString(codeWriter.write(address, 150, 150));
-                if (qr_code) {
-                   self.env.pos.qr_image = "data:image/svg+xml;base64,"+ window.btoa(qr_code_svg);
-                }
+                self.env.pos.qr_image = "data:image/svg+xml;base64,"+ window.btoa(qr_code_svg);
                 if (number) {
                    self.env.pos.invoice  = result.invoice_name
                 }
@@ -66,8 +64,6 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) {
          }
          }
 
-
-
        Registries.Component.extend(PaymentScreen, PosPaymentReceiptExtend);
 
     return PaymentScreen;
diff --git a/pos_receipt_extend/static/src/xml/OrderReceipt.xml b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
index 2ec8e577c..1cc312d93 100755
--- a/pos_receipt_extend/static/src/xml/OrderReceipt.xml
+++ b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
@@ -3,44 +3,51 @@
     <t t-name="OrderReceipt" t-inherit="point_of_sale.OrderReceipt"
        t-inherit-mode="extension" owl="1">
         <xpath expr="//div[hasclass('pos-receipt-contact')]" position="inside">
+            <t t-if="this.env.pos.selectedOrder.partner">
                 <t t-if="this.env.pos.selectedOrder.partner.name">
                     <div style="font-weight:bold;">Customer Name:
                         <t t-esc="this.env.pos.selectedOrder.partner.name"/>
                     </div>
                 </t>
-            <t t-if="this.env.pos.selectedOrder.partner.street">
+                <t t-if="this.env.pos.selectedOrder.partner.street">
                     <div style="font-weight:bold;">Customer Address:
                     <t t-esc="this.env.pos.selectedOrder.partner.street"/>
                     </div>
             </t>
-            <t t-if="this.env.pos.selectedOrder.partner.mobile">
+                <t t-if="this.env.pos.selectedOrder.partner.mobile">
                     <div style="font-weight:bold;">Customer Mobile:
                     <t t-esc="this.env.pos.selectedOrder.partner.mobile"/>
                 </div>
             </t>
-            <t t-if="this.env.pos.selectedOrder.partner.phone">
+                <t t-if="this.env.pos.selectedOrder.partner.phone">
                 <div style="font-weight:bold;">Customer Phone:
                     <t t-esc="this.env.pos.selectedOrder.partner.phone"/>
                 </div>
             </t>
-            <t t-if="this.env.pos.selectedOrder.partner.email">
+                <t t-if="this.env.pos.selectedOrder.partner.email">
                 <div style="font-weight:bold;">Customer Email:
                     <t t-esc="this.env.pos.selectedOrder.partner.email"/>
                 </div>
             </t>
-            <t t-if="this.env.pos.selectedOrder.partner.vat">
+                <t t-if="this.env.pos.selectedOrder.partner.vat">
                 <div style="font-weight:bold;">Customer Vat:
                     <t t-esc="this.env.pos.selectedOrder.partner.vat"/>
                 </div>
             </t>
-            <t t-if="this.env.pos.invoice">
+                <t t-if="this.env.pos.invoice">
                 <div style="font-weight:bold;">Invoice Number:
                     <t t-esc="this.env.pos.invoice"/>
                 </div>
             </t>
-            <div style="font-weight:bold;">
-                     <img t-attf-src="{{this.env.pos.qr_image}}" style="width:50%;"/>
-            </div>
+            </t>
+             <t t-if="this.env.pos.session_orders[0].qr_code">
+                <t t-if="env.pos.qr_image">
+                    <div style="font-weight:bold;">
+                        <img t-attf-src="{{env.pos.qr_image}}"
+                             style="width:50%;"/>
+                    </div>
+                </t>
+            </t>
         </xpath>
     </t>
 </templates>
\ No newline at end of file