diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index f1425497196b00e86189a1f3ca24b1ee6ca54b3a..312e61bb6e4b3094ece8fe0d68f242613a7ac263 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -22,7 +22,7 @@ class Escaper
      * @param array $allowedTags
      * @return string|array
      */
-    public function escapeHtml($data, $allowedTags = [])
+    public function escapeHtml($data, $allowedTags = null)
     {
         if (is_array($data)) {
             $result = [];
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index abcb31a5b4f79322cb515d9bb3c5c9576b7d099a..0ba64d05b9605a883bfb30251c4f47363429fca5 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -152,7 +152,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
 
         $zendEscaper = new \Magento\Framework\ZendEscaper();
         $escaper = new \Magento\Framework\Escaper();
-        $objectManager->setBackwardCompatibleProperty($escaper, 'zendEscaper', $zendEscaper);
+        $objectManager->setBackwardCompatibleProperty($escaper, 'escaper', $zendEscaper);
         $objectManager->setBackwardCompatibleProperty($model, 'escaper', $escaper);
 
         return $model;
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 8e4b4bd32bec1fe44806387e8eae643eff700d5b..3e21ff1b762f84019bb8900e85aa087eabd3946f 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -871,14 +871,14 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * @param array|null $allowedTags
      * @return string
      */
-    public function escapeHtml($data, $allowedTags = [])
+    public function escapeHtml($data, $allowedTags = null)
     {
         return $this->_escaper->escapeHtml($data, $allowedTags);
     }
 
     /**
      * Escape string for the JavaScript context
-     * 
+     *
      * @param string $string
      * @return string
      */