diff --git a/application/front/controller/visitor/ShaarliVisitorController.php b/application/front/controller/visitor/ShaarliVisitorController.php
index d3f28f2f7..ac53f5b4d 100644
--- a/application/front/controller/visitor/ShaarliVisitorController.php
+++ b/application/front/controller/visitor/ShaarliVisitorController.php
@@ -61,6 +61,7 @@ protected function render(string $template): string
         $this->assignView('template', $template);
 
         $this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL));
+        $this->assignView('publicLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PUBLIC));
         $this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));
 
         $this->executeDefaultHooks($template);
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 7208a3b60..e2916fd94 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -7,11 +7,11 @@
 {include="page.header"}
 
 <div class="linkcount pure-u-0 pure-u-lg-visible">
-  {if="!empty($linkcount)"}
+  {if="$is_logged_in"}
   <span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"}
-  {if="$privateLinkcount>0"}
   <br><span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"}
-  {/if}
+  {else}
+  <span class="strong">{$publicLinkcount}</span> {function="t('shaare', 'shaares', $publicLinkcount)"}
   {/if}
 </div>
 
@@ -56,11 +56,11 @@
     <div class="pure-u-lg-2-24 pure-u-1-24"></div>
     <div id="link-count-content" class="pure-u-lg-20-24 pure-u-22-24">
       <div class="linkcount pure-u-lg-0 center">
-        {if="!empty($linkcount)"}
+        {if="$is_logged_in"}
         <span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"}
-        {if="$privateLinkcount>0"}
         &middot; <span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"}
-        {/if}
+        {else}
+        <span class="strong">{$publicLinkcount}</span> {function="t('shaare', 'shaares', $publicLinkcount)"}
         {/if}
       </div>
 
diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 64d7f656e..01358a74e 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -2,8 +2,12 @@
 <div id="logo" title="Share your links !" onclick="document.location='{$titleLink}';"></div>
 
 <div id="linkcount" class="nomobile">
-    {if="!empty($linkcount)"}{$linkcount} links{/if}<br>
-    {if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if}
+  {if="$is_logged_in"}
+  {$linkcount} links<br>
+  {$privateLinkcount} private links
+  {else}
+  {$publicLinkcount} links
+  {/if}
 </div>
 
 <div id="menu">