diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index f5f9119be54..0c7fa827276 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -46,12 +46,17 @@ export default {
 
     // Update badge clicks unless it's our own
     if (!ownLink) {
-      var $badge = $('span.badge', $link);
+      const $badge = $('span.badge', $link);
       if ($badge.length === 1) {
         // don't update counts in category badge nor in oneboxes (except when we force it)
         if (isValidLink($link)) {
-          var html = $badge.html();
-          if (/^\d+$/.test(html)) { $badge.html(parseInt(html, 10) + 1); }
+          const html = $badge.html();
+          const d = new Date();
+          const key = `${d.getFullYear()}-${d.getMonth()}-${d.getDay()}-${postId}-${href}`;
+          if (/^\d+$/.test(html) && !sessionStorage.getItem(key)) {
+            sessionStorage.setItem(key, true);
+            $badge.html(parseInt(html, 10) + 1);
+          }
         }
       }
     }
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index bebe653d6f1..dfe4f83c3a2 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -19,14 +19,14 @@ module("lib:click-track", {
       `<div id="topic" data-topic-id="1337">
         <article data-post-id="42" data-user-id="3141">
           <a href="http://www.google.com">google.com</a>
-          <a class="lightbox back quote-other-topic" href="http://www.google.com">google.com</a>
-          <a id="with-badge" data-user-id="314" href="http://www.google.com">google.com<span class="badge">1</span></a>
-          <a id="with-badge-but-not-mine" href="http://www.google.com">google.com<span class="badge">1</span></a>
+          <a class="lightbox back quote-other-topic" href="http://www.google.fr">google.fr</a>
+          <a id="with-badge" data-user-id="314" href="http://www.google.de">google.de<span class="badge">1</span></a>
+          <a id="with-badge-but-not-mine" href="http://www.google.es">google.es<span class="badge">1</span></a>
           <div class="onebox-result">
-            <a id="inside-onebox" href="http://www.google.com">google.com<span class="badge">1</span></a>
-            <a id="inside-onebox-forced" class="track-link" href="http://www.google.com">google.com<span class="badge">1</span></a>
+            <a id="inside-onebox" href="http://www.google.co.uk">google.co.uk<span class="badge">1</span></a>
+            <a id="inside-onebox-forced" class="track-link" href="http://www.google.at">google.at<span class="badge">1</span></a>
           </div>
-          <a class="no-track-link" href="http://www.google.com">google.com</a>
+          <a class="no-track-link" href="http://www.google.com.br">google.com.br</a>
           <a id="same-site" href="http://discuss.domain.com">forum</a>
           <a class="attachment" href="http://discuss.domain.com/uploads/default/1234/1532357280.txt">log.txt</a>
           <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>