diff --git a/src/common/datetime/relative_time.ts b/src/common/datetime/relative_time.ts
index cc414b1e12..c2a761394b 100644
--- a/src/common/datetime/relative_time.ts
+++ b/src/common/datetime/relative_time.ts
@@ -21,6 +21,11 @@ export default function relativeTime(
   const tense = delta >= 0 ? "past" : "future";
   delta = Math.abs(delta);
   let roundedDelta = Math.round(delta);
+
+  if (roundedDelta === 0) {
+    return localize("ui.components.relative_time.just_now");
+  }
+
   let unit = "week";
 
   for (let i = 0; i < tests.length; i++) {
diff --git a/src/panels/config/tags/ha-config-tags.ts b/src/panels/config/tags/ha-config-tags.ts
index e7b716b2be..a0dd7e32b8 100644
--- a/src/panels/config/tags/ha-config-tags.ts
+++ b/src/panels/config/tags/ha-config-tags.ts
@@ -70,12 +70,12 @@ export class HaConfigTags extends SubscribeMixin(LitElement) {
           template: (name, tag: any) => html`${name}
           ${narrow
             ? html`<div class="secondary">
-                ${tag.last_scanned
+                ${tag.last_scanned_datetime
                   ? html`<ha-relative-time
                       .hass=${this.hass}
                       .datetimeObj=${tag.last_scanned_datetime}
                     ></ha-relative-time>`
-                  : this.hass.localize("ui.components.relative_time.never")}
+                  : this.hass.localize("ui.panel.config.tags.never_scanned")}
               </div>`
             : ""}`,
         },
@@ -94,7 +94,7 @@ export class HaConfigTags extends SubscribeMixin(LitElement) {
                   .hass=${this.hass}
                   .datetimeObj=${last_scanned_datetime}
                 ></ha-relative-time>`
-              : this.hass.localize("ui.components.relative_time.never")}
+              : this.hass.localize("ui.panel.config.tags.never_scanned")}
           `,
         };
       }
diff --git a/src/translations/en.json b/src/translations/en.json
index 673f59ad39..7bdac00b42 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -319,6 +319,7 @@
         "past": "{time} ago",
         "future": "In {time}",
         "never": "Never",
+        "just_now": "Just now",
         "duration": {
           "second": "{count} {count, plural,\n  one {second}\n  other {seconds}\n}",
           "minute": "{count} {count, plural,\n  one {minute}\n  other {minutes}\n}",
@@ -631,6 +632,7 @@
           "add_tag": "Add tag",
           "write": "Write",
           "edit": "Edit",
+          "never_scanned": "Never scanned",
           "create_automation": "Create automation with tag",
           "automation_title": "Tag {name} is scanned",
           "headers": {