diff --git a/src/data/logbook.ts b/src/data/logbook.ts
index fd79c87301..ac6f342f7b 100644
--- a/src/data/logbook.ts
+++ b/src/data/logbook.ts
@@ -7,6 +7,8 @@ export interface LogbookEntry {
   entity_id?: string;
   domain: string;
   context_user_id?: string;
+  context_entity_id?: string;
+  context_entity_id_name?: string;
 }
 
 const DATA_CACHE: {
diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts
index 3fb8bf7a0c..d95ee7e156 100644
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -118,6 +118,18 @@ class HaLogbook extends LitElement {
                 ? ` (${item_username})`
                 : ``}</span
             >
+            ${!item.context_entity_id
+              ? ""
+              : html`
+                  by
+                  <a
+                    href="#"
+                    @click=${this._entityClicked}
+                    .entityId=${item.context_entity_id}
+                    class="name"
+                    >${item.context_entity_id_name}</a
+                  >
+                `}
           </div>
         </div>
       </div>