diff --git a/assets/js/main.js b/assets/js/main.js
index 03fbdf20..57e6416b 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -73,12 +73,31 @@ const forEveryClapButton = (fn, sameAction = '') => {
 }
 
 document.addEventListener("DOMContentLoaded", () => {
+  let toCheck = []
   forEveryClapButton((btn) => {
-    const lastClappedTo = localStorage.getItem(clapKey(btn.parentElement.action));
+    const action = btn.parentElement.action
+    const lastClappedTo = localStorage.getItem(clapKey(action));
+    toCheck.push(action)
     if (lastClappedTo) {
       btn.parentElement.classList.add('clapped')
       setClapCount(btn, lastClappedTo)
     }
     btn.addEventListener("click", performClap)
   })
+
+  toCheck.forEach((action) => {
+    fetch(action, { method: 'GET', headers: new Headers({ 'Accept': 'application/json' }) })
+      .then(res => {
+        if (res.status !== 200) {
+          throw new Error(`Got HTTP ${res.status} while trying to retrieve claps`)
+        }
+        return res.json() 
+      })
+      .then(data => {
+        forEveryClapButton((btn) => {
+          setClapCount(btn, data.claps);
+        }, action)
+      })
+      .catch(console.error)
+  })
 })
diff --git a/layouts/partials/claps.html b/layouts/partials/claps.html
index daf912ec..ca85e1b1 100644
--- a/layouts/partials/claps.html
+++ b/layouts/partials/claps.html
@@ -4,7 +4,7 @@
   <button type="submit" title="Show appreciation for the post on this page">
     {{- partial "svg.html" (dict "name" $style) -}}
     {{- $url := printf "https://%s" site.Params.clapsHost -}}
-    {{- $cacheKey := print $url (now.Format "-2006-01-02") -}}
+    {{- $cacheKey := print $url (now.Format "-2006-01-02-15") -}}
     {{- with resources.GetRemote $url (dict "key" $cacheKey) -}}
       {{- with .Err -}}
         {{- errorf "%s" . -}}
diff --git a/layouts/shortcodes/topclaps.html b/layouts/shortcodes/topclaps.html
index 8adc2a5f..dd172291 100644
--- a/layouts/shortcodes/topclaps.html
+++ b/layouts/shortcodes/topclaps.html
@@ -1,6 +1,6 @@
 {{- $count := .Get 0 | default 5 -}}
 {{- $url := printf "https://%s" site.Params.clapsHost -}}
-{{- $cacheKey := print $url (now.Format "-2006-01-02") -}}
+{{- $cacheKey := print $url (now.Format "-2006-01-02-15") -}}
 {{- with resources.GetRemote $url (dict "key" $cacheKey) -}}
   {{- with .Err -}}
     {{- errorf "%s" . -}}