diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index 6336061335d0e..3c4e443b7e802 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -4,29 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block */
-/** @var \Magento\Captcha\Model\DefaultModel $captcha */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Captcha\Model\DefaultModel $captcha
+ */
 
+/** @var \Magento\Captcha\Model\DefaultModel $captcha */
 $captcha = $block->getCaptchaModel();
+
 /** @var bool $validationEnabled */
 $validationEnabled = $block->hasData('frontend_validation') ? $block->getData('frontend_validation') : true;
 ?>
 <div class="admin__field<?php if ($validationEnabled): ?> _required<?php endif; ?>">
     <label for="captcha" class="admin__field-label">
-        <span><?= $block->escapeHtml(__('Please enter the letters and numbers from the image')) ?></span>
+        <span><?= $escaper->escapeHtml(__('Please enter the letters and numbers from the image')) ?></span>
     </label>
     <div class="admin__field-control">
         <input
             id="captcha"
             class="admin__control-text"
             type="text"
-            name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE)
-            ?>[<?= $block->escapeHtml($block->getFormId()) ?>]"
+            name="<?= $escaper->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE)
+            ?>[<?= $escaper->escapeHtml($block->getFormId()) ?>]"
             <?php if ($validationEnabled): ?>data-validate="{required:true}"<?php endif; ?>/>
         <?php if ($captcha->isCaseSensitive()):?>
             <div class="admin__field-note">
-                <span><?= $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong'])
+                <span><?= $escaper->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong'])
                 ?></span>
             </div>
         <?php endif; ?>
@@ -36,18 +41,18 @@ $validationEnabled = $block->hasData('frontend_validation') ? $block->getData('f
     <img
         id="captcha-reload"
         class="captcha-reload"
-        src="<?= $block->escapeUrl($block->getViewFileUrl('Magento_Captcha::reload.png')) ?>"
-        alt="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>"/>
+        src="<?= $escaper->escapeUrl($block->getViewFileUrl('Magento_Captcha::reload.png')) ?>"
+        alt="<?= $escaper->escapeHtmlAttr(__('Reload captcha')) ?>"/>
     <img
-        id="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
+        id="<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>"
         width="<?= /* @noEscape */ (float) $block->getImgWidth() ?>"
         height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>"
-        src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>" />
+        src="<?= $escaper->escapeUrl($captcha->getImgSrc()) ?>" />
 </div>
 
 <?php
-$url = $block->escapeJs($block->getRefreshUrl());
-$formId = $block->escapeJs($block->escapeHtml($block->getFormId()));
+$url = $escaper->escapeJs($block->getRefreshUrl());
+$formId = $escaper->escapeJs($escaper->escapeHtml($block->getFormId()));
 $scriptString = <<<script
 
     require(["prototype", "mage/captcha"], function(){
diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
index 0d436cc62b790..f1d6739e0c6ce 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -4,45 +4,49 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block */
+/**
+ * @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 /** @var \Magento\Captcha\Model\DefaultModel $captcha */
 $captcha = $block->getCaptchaModel();
+
 /** @var bool $validationEnabled */
 $validationEnabled = $block->hasData('frontend_validation') ? $block->getData('frontend_validation') : true;
-$inputName = $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
-$loaderUrl = $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif'));
-$note = $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']);
+$inputName = $escaper->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
+$loaderUrl = $escaper->escapeUrl($block->getViewFileUrl('images/loader-2.gif'));
+$note = $escaper->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']);
 ?>
 <div class="field captcha<?php if ($validationEnabled): ?> required<?php endif; ?>"
-     role="<?= $block->escapeHtmlAttr($block->getFormId()) ?>">
-    <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label">
-        <span><?= $block->escapeHtml(__('Please type the letters and numbers below')) ?></span>
+     role="<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>">
+    <label for="captcha_<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>" class="label">
+        <span><?= $escaper->escapeHtml(__('Please type the letters and numbers below')) ?></span>
     </label>
     <div class="control captcha">
         <input
-            name="<?= /* @noEscape */ $inputName ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]"
+            name="<?= /* @noEscape */ $inputName ?>[<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>]"
             type="text"
             class="input-text<?php if ($validationEnabled): ?> required-entry<?php endif; ?>"
             <?php if ($validationEnabled): ?>data-validate="{required:true}"<?php endif; ?>
-            id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
+            id="captcha_<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>"
             autocomplete="off"/>
         <div class="nested">
             <div class="field captcha no-label"
-                 data-captcha="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
-                 id="captcha-container-<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
-                 data-mage-init='{"captcha":{"url": "<?= $block->escapeUrl($block->getRefreshUrl()) ?>",
+                 data-captcha="<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>"
+                 id="captcha-container-<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>"
+                 data-mage-init='{"captcha":{"url": "<?= $escaper->escapeUrl($block->getRefreshUrl()) ?>",
                                             "imageLoader": "<?= /* @noEscape */ $loaderUrl ?>",
-                                             "type": "<?= $block->escapeHtmlAttr($block->getFormId()) ?>"}}'>
+                                             "type": "<?= $escaper->escapeHtmlAttr($block->getFormId()) ?>"}}'>
                 <div class="control captcha-image">
-                    <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters and numbers below')) ?>"
+                    <img alt="<?= $escaper->escapeHtmlAttr(__('Please type the letters and numbers below')) ?>"
                          class="captcha-img"
                          height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>"
-                         src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
+                         src="<?= $escaper->escapeUrl($captcha->getImgSrc()) ?>"/>
                     <button type="button"
                             class="action reload captcha-reload"
-                            title="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>">
-                        <span><?= $block->escapeHtml(__('Reload captcha')) ?></span>
+                            title="<?= $escaper->escapeHtmlAttr(__('Reload captcha')) ?>">
+                        <span><?= $escaper->escapeHtml(__('Reload captcha')) ?></span>
                     </button>
                 </div>
             </div>