diff --git a/src/panels/logbook/ha-logbook-data.js b/src/panels/logbook/ha-logbook-data.js
index 8be479e4f8..12a1969f4f 100644
--- a/src/panels/logbook/ha-logbook-data.js
+++ b/src/panels/logbook/ha-logbook-data.js
@@ -59,7 +59,7 @@ class HaLogbookData extends PolymerElement {
 
     this._setIsLoading(true);
 
-    this.getDate(this.filterDate, this.filterPeriod, this.filterEntity).then(
+    this.getData(this.filterDate, this.filterPeriod, this.filterEntity).then(
       (logbookEntries) => {
         this._setEntries(logbookEntries);
         this._setIsLoading(false);
@@ -67,7 +67,7 @@ class HaLogbookData extends PolymerElement {
     );
   }
 
-  getDate(date, period, entityId) {
+  getData(date, period, entityId) {
     if (!entityId) entityId = ALL_ENTITIES;
 
     if (!DATA_CACHE[period]) DATA_CACHE[period] = [];
diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts
index e92d4aacfe..f72edab10c 100644
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -25,19 +25,14 @@ class HaLogbook extends LitElement {
   // @ts-ignore
   private _rtl = false;
 
-  protected updated(changedProps: PropertyValues) {
-    super.updated(changedProps);
-    if (!changedProps.has("hass")) {
-      return;
-    }
+  protected shouldUpdate(changedProps: PropertyValues) {
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (oldHass && oldHass.language !== this.hass.language) {
-      this._rtl = computeRTL(this.hass);
-    }
+    const languageChanged =
+      oldHass === undefined || oldHass.language !== this.hass.language;
+    return changedProps.has("entries") || languageChanged;
   }
 
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
+  protected updated(_changedProps: PropertyValues) {
     this._rtl = computeRTL(this.hass);
   }