diff --git a/index.php b/index.php
index c35c1c7..4aca53b 100644
--- a/index.php
+++ b/index.php
@@ -1815,7 +1815,7 @@ function buildLinkList($PAGE,$LINKSDB)
         uasort($taglist, 'strcasecmp');
         $link['taglist']=$taglist;
         if(!empty($link['via'])){
-          $link['via']=nl2br(htmlspecialchars($link['via']));
+          $link['via']=htmlspecialchars($link['via']);
         }
         $linkDisp[$keys[$i]] = $link;
         $i++;
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 0c5f8d0..8111feb 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -43,7 +43,7 @@
                 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
                 <br>
                 {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
-                {if="$value.via"}<div><a href="{$value.via}">@ via {$value.via|getJustDomain}</a></div>{/if}
+                {if condition="isset($value.via) && !empty($value.via)"}<div><a href="{$value.via}">@ via {$value.via|getJustDomain}</a></div>{/if}
                 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
                     <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
                 {else}