diff --git a/Parsedown.php b/Parsedown.php
index b274f52..9558525 100644
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1495,9 +1495,10 @@ class Parsedown
         }
         // very strongly consider an alternative if you're writing an
         // extension
-        elseif (isset($Element['unsafeHtml']) and !$this->safeMode)
+        elseif (isset($Element['unsafeHtml']))
         {
             $text = $Element['unsafeHtml'];
+
             $unsafeHtml = true;
         }
 
diff --git a/test/ParsedownTest.php b/test/ParsedownTest.php
index 3cd796e..8f3e6c8 100644
--- a/test/ParsedownTest.php
+++ b/test/ParsedownTest.php
@@ -60,11 +60,17 @@ class ParsedownTest extends TestCase
     {
         $markdown = "```php\nfoobar\n```";
         $expectedMarkup = '<pre><code class="language-php"><p>foobar</p></code></pre>';
+        $expectedSafeMarkup = '<pre><code class="language-php">&lt;p&gt;foobar&lt;/p&gt;</code></pre>';
 
         $unsafeExtension = new UnsafeExtension;
         $actualMarkup = $unsafeExtension->text($markdown);
 
         $this->assertEquals($expectedMarkup, $actualMarkup);
+
+        $unsafeExtension->setSafeMode(true);
+        $actualSafeMarkup = $unsafeExtension->text($markdown);
+
+        $this->assertEquals($expectedSafeMarkup, $actualSafeMarkup);
     }
 
     function data()