diff --git a/www/templates/charisma/views/frontend/viewnzb.tpl b/www/templates/charisma/views/frontend/viewnzb.tpl
index bf3e77528..e9bdca7df 100644
--- a/www/templates/charisma/views/frontend/viewnzb.tpl
+++ b/www/templates/charisma/views/frontend/viewnzb.tpl
@@ -190,7 +190,7 @@
 
 															<div class="btn-group btn-group-vertical">
 																<a class="btn btn-primary btn-sm btn-success btn-transparent"
-																   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"url"}"><i
+																   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"htmlall"}"><i
 																			class="fa fa-download"></i> Download</a>
 																<button type="button"
 																		class="btn btn-primary btn-sm btn-info btn-transparent cartadd">
diff --git a/www/templates/omicron/views/frontend/viewnzb.tpl b/www/templates/omicron/views/frontend/viewnzb.tpl
index afc71156b..102c4b6dc 100644
--- a/www/templates/omicron/views/frontend/viewnzb.tpl
+++ b/www/templates/omicron/views/frontend/viewnzb.tpl
@@ -203,7 +203,7 @@
 
 													<div class="btn-group btn-group-vertical">
 														<a class="btn btn-primary btn-sm btn-success btn-transparent"
-														   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"url"}"><i
+														   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"htmlall"}"><i
 																	class="fa fa-download"></i>
 															Download</a>
 														<button type="button"