diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts
index 9e4d8d87e4..c07be7594d 100644
--- a/src/common/entity/compute_state_display.ts
+++ b/src/common/entity/compute_state_display.ts
@@ -117,7 +117,10 @@ export const computeStateDisplay = (
   }
 
   // state of button is a timestamp
-  if (domain === "button") {
+  if (
+    domain === "button" ||
+    (domain === "sensor" && stateObj.attributes.device_class === "timestamp")
+  ) {
     return formatDateTime(new Date(compareState), locale);
   }