diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
index 01ed26d5e57a6..f27e417feeeca 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -6,16 +6,17 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
-    <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
+    <?php $methodCode = $escaper->escapeHtml($block->getMethodCode());?>
     <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <li>
             <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
-                <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
+                <?= /* @noEscape */ nl2br($escaper->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
index c1b07f08d4ce3..674c7f4d0e387 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -6,16 +6,17 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
-    <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
+    <?php $methodCode = $escaper->escapeHtml($block->getMethodCode());?>
     <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <li>
             <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
-                <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
+                <?= /* @noEscape */ nl2br($escaper->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index 789a3921b2c21..591d6918daadc 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -6,24 +6,25 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" >
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $escaper->escapeHtml($block->getMethodCode()) ?>" >
     <?php if ($block->getMethod()->getPayableTo()): ?>
-        <label class="label"><span><?= $block->escapeHtml(__('Make Check payable to:')) ?></span></label>
-        <?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
+        <label class="label"><span><?= $escaper->escapeHtml(__('Make Check payable to:')) ?></span></label>
+        <?= $escaper->escapeHtml($block->getMethod()->getPayableTo()) ?>
     <?php endif; ?>
     <?php if ($block->getMethod()->getMailingAddress()): ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?= $block->escapeHtml(__('Send Check to:')) ?></span></label>
+            <label class="admin__field-label"><span><?= $escaper->escapeHtml(__('Send Check to:')) ?></span></label>
             <div class="admin__field-control checkmo-mailing-address">
-                <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
+                <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMethod()->getMailingAddress())) ?>
             </div>
         </div>
     <?php endif; ?>
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode())
+    'fieldset#payment_form_' . $escaper->escapeJs($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index a1e3da2713811..ad9d610356b04 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -6,17 +6,18 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $escaper->escapeHtml($block->getMethodCode()) ?>">
     <div class="admin__field _required">
         <label for="po_number" class="admin__field-label">
-            <span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Purchase Order Number')) ?></span>
         </label>
         <div class="admin__field-control">
             <input type="text" id="po_number" name="payment[po_number]"
-                   title="<?= $block->escapeHtml(__("Purchase Order Number")) ?>"
+                   title="<?= $escaper->escapeHtml(__("Purchase Order Number")) ?>"
                    class="required-entry admin__control-text"
                    value="<?= /* @noEscape */ $block->getInfoData('po_number') ?>"/>
         </div>
@@ -24,5 +25,5 @@
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode())
+    'fieldset#payment_form_' . $escaper->escapeJs($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
index 28395f8eeb849..dbdb3455e9a92 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -6,18 +6,19 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  */
 $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($paymentTitle) ?>
+<?= $escaper->escapeHtml($paymentTitle) ?>
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     <?php if ($block->getPayableTo()) : ?>
-        <br /><?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        <br /><?= $escaper->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
     <?php endif; ?>
     <?php if ($block->getMailingAddress()) : ?>
-        <label><?= $block->escapeHtml(__('Send Check to:')) ?></label>
+        <label><?= $escaper->escapeHtml(__('Send Check to:')) ?></label>
         <div class="checkmo-mailing-address">
-            <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+            <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMailingAddress())) ?>
         </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
index f85a8f8357dd9..2b97752635076 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
@@ -6,21 +6,22 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  */
 $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($paymentTitle) ?>
+<?= $escaper->escapeHtml($paymentTitle) ?>
     {{pdf_row_separator}}
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     {{pdf_row_separator}}
     <?php if ($block->getPayableTo()) : ?>
-        <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        <?= $escaper->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
     <?php if ($block->getMailingAddress()) : ?>
-        <?= $block->escapeHtml(__('Send Check to:')) ?>
+        <?= $escaper->escapeHtml(__('Send Check to:')) ?>
         {{pdf_row_separator}}
-        <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+        <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMailingAddress())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
index 4a6ea1c00b21c..0ccc8b6f24e42 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
@@ -5,7 +5,8 @@
  */
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
-<?= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+<?= $escaper->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
     {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
index ae7f654a1350b..62e2db0fb64c1 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
@@ -5,13 +5,14 @@
  */
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  */
 $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<div class="order-payment-method-name"><?= $block->escapeHtml($paymentTitle) ?></div>
+<div class="order-payment-method-name"><?= $escaper->escapeHtml($paymentTitle) ?></div>
 <table class="data-table admin__table-secondary">
     <tr>
-        <th><?= $block->escapeHtml(__('Purchase Order Number')) ?>:</th>
-        <td><?= $block->escapeHtml($block->getInfo()->getPoNumber()) ?></td>
+        <th><?= $escaper->escapeHtml(__('Purchase Order Number')) ?>:</th>
+        <td><?= $escaper->escapeHtml($block->getInfo()->getPoNumber()) ?></td>
     </tr>
 </table>
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
index d8d952526e67b..1d96e3709ddb6 100644
--- a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
@@ -6,20 +6,21 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?>
     {{pdf_row_separator}}
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     {{pdf_row_separator}}
     <?php if ($block->getPayableTo()) : ?>
-        <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        <?= $escaper->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
     <?php if ($block->getMailingAddress()) : ?>
-        <?= $block->escapeHtml(__('Send Check to:')) ?>
+        <?= $escaper->escapeHtml(__('Send Check to:')) ?>
         {{pdf_row_separator}}
-        <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+        <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMailingAddress())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
index 4a6ea1c00b21c..0ccc8b6f24e42 100644
--- a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
@@ -5,7 +5,8 @@
  */
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
-<?= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+<?= $escaper->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
     {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
index 97288194342ba..2342d59f5143d 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -6,15 +6,16 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
-    <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
+    <?php $methodCode = $escaper->escapeHtml($block->getMethodCode());?>
     <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement checkout-agreement-item-content"
          id="payment_form_<?= /* @noEscape */ $methodCode ?>">
-        <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
+        <?= /* @noEscape */ nl2br($escaper->escapeHtml($instructions)) ?>
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "display:none",
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
index 160c1d27052f0..88892b96191b9 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
@@ -6,15 +6,16 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
-    <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
+    <?php $methodCode = $escaper->escapeHtml($block->getMethodCode());?>
     <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement"
          id="payment_form_<?= /* @noEscape */ $methodCode ?>">
-        <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
+        <?= /* @noEscape */ nl2br($escaper->escapeHtml($instructions)) ?>
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "display:none",
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
index 3b381bbf72f4f..85f23b9be1960 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -6,26 +6,27 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?>
-    <dl class="items check payable" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+    <dl class="items check payable" id="payment_form_<?= $escaper->escapeHtml($block->getMethodCode()) ?>">
         <?php if ($block->getMethod()->getPayableTo()): ?>
-            <dt class="title"><?= $block->escapeHtml(__('Make Check payable to:')) ?></dt>
-            <dd class="content"><?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
+            <dt class="title"><?= $escaper->escapeHtml(__('Make Check payable to:')) ?></dt>
+            <dd class="content"><?= $escaper->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
         <?php endif; ?>
         <?php if ($block->getMethod()->getMailingAddress()): ?>
-            <dt class="title"><?= $block->escapeHtml(__('Send Check to:')) ?></dt>
+            <dt class="title"><?= $escaper->escapeHtml(__('Send Check to:')) ?></dt>
             <dd class="content">
                 <address class="checkmo mailing address">
-                    <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
+                    <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMethod()->getMailingAddress())) ?>
                 </address>
             </dd>
         <?php endif; ?>
     </dl>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "display:none",
-        'dl#payment_form_' . $block->escapeJs($block->getMethodCode())
+        'dl#payment_form_' . $escaper->escapeJs($block->getMethodCode())
     ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
index 35ef5d9db8616..bc9cb41cbaf0f 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
@@ -6,19 +6,20 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-$methodCode = $block->escapeHtml($block->getMethodCode());
+$methodCode = $escaper->escapeHtml($block->getMethodCode());
 ?>
 <fieldset class="fieldset items <?= /* @noEscape */ $methodCode ?>"
           id="payment_form_<?= /* @noEscape */ $methodCode ?>">
     <div class="field number required">
-        <label for="po_number" class="label"><span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
+        <label for="po_number" class="label"><span><?= $escaper->escapeHtml(__('Purchase Order Number')) ?></span></label>
         <div class="control">
             <input type="text" id="po_number" name="payment[po_number]"
-                   title="<?= $block->escapeHtml(__('Purchase Order Number')) ?>"
+                   title="<?= $escaper->escapeHtml(__('Purchase Order Number')) ?>"
                    class="input-text required-entry"
-                   value="<?= $block->escapeHtml($block->getInfoData('po_number')) ?>" />
+                   value="<?= $escaper->escapeHtml($block->getInfoData('po_number')) ?>" />
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
index 2dc226db4264c..099047fbbdfe7 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
@@ -6,22 +6,23 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <dl class="payment-method checkmemo">
-    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?></dt>
     <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
         <?php if ($block->getPayableTo()) : ?>
             <dd class="content">
-                <strong><?= $block->escapeHtml(__('Make Check payable to')) ?></strong>
-                <?= $block->escapeHtml($block->getPayableTo()) ?>
+                <strong><?= $escaper->escapeHtml(__('Make Check payable to')) ?></strong>
+                <?= $escaper->escapeHtml($block->getPayableTo()) ?>
             </dd>
         <?php endif; ?>
         <?php if ($block->getMailingAddress()) : ?>
             <dd class="content">
-                <strong><?= $block->escapeHtml(__('Send Check to')) ?></strong>
+                <strong><?= $escaper->escapeHtml(__('Send Check to')) ?></strong>
                 <address class="checkmo mailing address">
-                    <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+                    <?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getMailingAddress())) ?>
                 </address>
             </dd>
         <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
index 523c2f8e9c0b4..c8dad6cecd937 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
@@ -5,12 +5,13 @@
  */
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <dl class="payment-method purchase order">
-    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?></dt>
     <dd class="content">
-        <strong><?= $block->escapeHtml(__('Purchase Order Number')) ?></strong>
-        <span class="number"><?= $block->escapeHtml($block->getInfo()->getPoNumber()) ?></span>
+        <strong><?= $escaper->escapeHtml(__('Purchase Order Number')) ?></strong>
+        <span class="number"><?= $escaper->escapeHtml($block->getInfo()->getPoNumber()) ?></span>
     </dd>
 </dl>