diff --git a/inc/functions.php b/inc/functions.php
index ac0a1c96..f21df417 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1396,8 +1396,10 @@ function markup(&$body, $track_cites = false) {
 	if ($config['auto_unicode']) {
 		$body = unicodify($body);
 	
-		foreach ($markup_urls as &$url) {
-			$body = str_replace(unicodify($url), $url, $body);
+		if ($config['markup_urls']) {
+			foreach ($markup_urls as &$url) {
+				$body = str_replace(unicodify($url), $url, $body);
+			}
 		}
 	}