diff --git a/docs/img/device-popup.png b/docs/img/device-popup.png
index 5161657..2acb47c 100644
Binary files a/docs/img/device-popup.png and b/docs/img/device-popup.png differ
diff --git a/docs/img/hero-map.png b/docs/img/hero-map.png
index 26ec69c..61b0101 100644
Binary files a/docs/img/hero-map.png and b/docs/img/hero-map.png differ
diff --git a/static/js/map.js b/static/js/map.js
index 4d716aa..ac7b835 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -182,7 +182,9 @@ function createMarker(capture) {
 
 function createPopupContent(capture) {
     const freqMHz = (capture.frequency / 1e6).toFixed(2);
-    const date = new Date(capture.captured_at).toLocaleDateString();
+    const ts = capture.timestamp || capture.captured_at;
+    const parsed = ts ? new Date(ts) : null;
+    const date = parsed && !isNaN(parsed) ? parsed.toLocaleDateString() : 'Unknown';
 
     let deviceInfo = 'Unknown Device';
     if (capture.device_name) {