diff --git a/src/Config/functions.php b/src/Config/functions.php
index 983365d70f..9d3164bdda 100644
--- a/src/Config/functions.php
+++ b/src/Config/functions.php
@@ -101,7 +101,7 @@ function scrub_out($string)
         return '';
     }
 
-    return htmlentities((string) $string, ENT_NOQUOTES, AmpConfig::get('site_charset'));
+    return htmlentities((string) $string, ENT_QUOTES, AmpConfig::get('site_charset'));
 } // scrub_out
 
 /**
diff --git a/src/Module/Util/Ui.php b/src/Module/Util/Ui.php
index d765f7830b..d5d1993f7d 100644
--- a/src/Module/Util/Ui.php
+++ b/src/Module/Util/Ui.php
@@ -677,7 +677,7 @@ public function scrubOut(?string $string): string
             return '';
         }
 
-        return htmlentities((string) $string, ENT_NOQUOTES, AmpConfig::get('site_charset'));
+        return htmlentities((string) $string, ENT_QUOTES, AmpConfig::get('site_charset'));
     }
 
     /**