diff --git a/app/javascript/application.js b/app/javascript/application.js
index 3b7646d..7bdfc28 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -11,6 +11,18 @@ document.addEventListener('turbo:load', (event) => {
     timeago.render(timeago_nodes);
   }
 
+  const localTimeFormatter = new Intl.DateTimeFormat(undefined, {
+    dateStyle: "medium",
+    timeStyle: "short",
+    timeZoneName: "short",
+  });
+  document.querySelectorAll('time.local-time').forEach((el) => {
+    const date = new Date(el.getAttribute('datetime'));
+    if (!isNaN(date.getTime())) {
+      el.textContent = localTimeFormatter.format(date);
+    }
+  });
+
   // Copy to clipboard for key installation on servers
   const clipboard = new ClipboardJS('.clipboard');
   clipboard.on('success', function (e) {
diff --git a/app/views/destinations/deploys.html.erb b/app/views/destinations/deploys.html.erb
index d4f721c..5a056fc 100644
--- a/app/views/destinations/deploys.html.erb
+++ b/app/views/destinations/deploys.html.erb
@@ -42,8 +42,9 @@
           </span>
         </div>
         <div class="is-flex is-align-items-center shipyrd-flex-gap-md">
-          <time class="is-size-7 has-text-grey" datetime="<%= latest.recorded_at %>">
-            <%= latest.recorded_at.in_time_zone(latest.application.organization.selected_time_zone).strftime("%Y-%m-%d %I:%M %p") %>
+          <% recorded_at = latest.recorded_at || latest.created_at %>
+          <time class="local-time is-size-7 has-text-grey" datetime="<%= recorded_at.iso8601 %>">
+            <%= recorded_at.in_time_zone(latest.application.organization.selected_time_zone).strftime("%Y-%m-%d %I:%M %p") %>
           </time>
           <% if latest.compare_url.present? %>
             <%= link_to "Compare changes", latest.compare_url, target: "_blank", class: "button is-info is-small has-text-white" %>