diff --git a/src/Adamlc/AddressFormat/Format.php b/src/Adamlc/AddressFormat/Format.php
index d8ba0b9..770f11f 100644
--- a/src/Adamlc/AddressFormat/Format.php
+++ b/src/Adamlc/AddressFormat/Format.php
@@ -109,6 +109,7 @@ public function formatAddress($html = false)
 
             //Replace new lines!
             if ($html) {
+                $formatted_address = htmlentities($formatted_address, ENT_QUOTES, 'UTF-8', false);
                 $formatted_address = str_replace('%n', "\n" . '<br>', $formatted_address);
             } else {
                 $formatted_address = trim(str_replace('%n', "\n", $formatted_address));