diff --git a/src/Entities.php b/src/Entities.php
index c5ba5db..8d3f0d7 100644
--- a/src/Entities.php
+++ b/src/Entities.php
@@ -376,7 +376,7 @@ final class Entities
                 'italic' => '<i>',
                 'code' => '<code>',
                 'pre' => isset($entity['language']) && $entity['language'] !== '' ? '<pre language="'.$entity['language'].'">' : '<pre>',
-                'text_link' => '<a href="'.$entity['url'].'">',
+                'text_link' => '<a href="'.EntityTools::htmlEscape($entity['url']).'">',
                 'strikethrough' => '<s>',
                 "underline" => '<u>',
                 "block_quote" => '<blockquote>',
diff --git a/tests/EntitiesTest.php b/tests/EntitiesTest.php
index 91ec175..6922d62 100644
--- a/tests/EntitiesTest.php
+++ b/tests/EntitiesTest.php
@@ -293,6 +293,18 @@ class EntitiesTest extends TestCase
             ]]
         ];
 
+        yield [
+            'test',
+            '<a href="https://google.com/?arg=a&amp;arg2=b">test</a>',
+            '<a href="https://google.com/?arg=a&amp;arg2=b">test</a>',
+            [[
+                'type' => 'text_link',
+                'offset' => 0,
+                'length' => 4,
+                'url' => 'https://google.com/?arg=a&arg2=b',
+            ]]
+        ];
+
         yield [
             'test',
             '<u>test</u>',
@@ -787,17 +799,17 @@ class EntitiesTest extends TestCase
             ],
             [
                 'html',
-                '<a href="https://google.com/">link </a>',
+                '<a href="https://google.com/?a=a&amp;b=b">link </a>',
                 'link',
                 [
                     [
                         'offset' => 0,
                         'length' => 4,
                         'type' => 'text_link',
-                        'url' => 'https://google.com/',
+                        'url' => 'https://google.com/?a=a&b=b',
                     ],
                 ],
-                '<a href="https://google.com/">link</a> ',
+                '<a href="https://google.com/?a=a&amp;b=b">link</a> ',
             ],
             [
                 'markdown',