diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php
index 7df15cf13..af2327b8e 100644
--- a/upload/ajax/view_torrent.php
+++ b/upload/ajax/view_torrent.php
@@ -156,10 +156,15 @@ class torrent
 
 	function build_file_item ($name, $length)
 	{
-		global $images, $lang;
+		global $bb_cfg, $images, $lang;
 
-		$magnet_name = '<a title="'.$lang['DC_MAGNET'].'" href="dchub:magnet:?kt='.$name.'&xl='.$length.'"><img src="'. $images['icon_dc_magnet'] .'" width="10" height="10" border="0" /></a>';
-		$magnet_ext  = '<a title="'.$lang['DC_MAGNET_EXT'].'" href="dchub:magnet:?kt=.'.substr(strrchr($name, '.'), 1).'&xl='.$length.'"><img src="'. $images['icon_dc_magnet_ext'] .'" width="10" height="10" border="0" /></a>';
+		$magnet_name = $magnet_ext = '';
+
+		if ($bb_cfg['magnet_links_enabled'])
+		{
+			$magnet_name = '<a title="'.$lang['DC_MAGNET'].'" href="dchub:magnet:?kt='.$name.'&xl='.$length.'"><img src="'. $images['icon_dc_magnet'] .'" width="10" height="10" border="0" /></a>';
+			$magnet_ext  = '<a title="'.$lang['DC_MAGNET_EXT'].'" href="dchub:magnet:?kt=.'.substr(strrchr($name, '.'), 1).'&xl='.$length.'"><img src="'. $images['icon_dc_magnet_ext'] .'" width="10" height="10" border="0" /></a>';
+		}
 
 		return "$name <i>$length</i> $magnet_name $magnet_ext";
 	}