diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts
index f27c669247..7cae936ef7 100644
--- a/src/components/ha-form/ha-form-float.ts
+++ b/src/components/ha-form/ha-form-float.ts
@@ -47,12 +47,19 @@ export class HaFormFloat extends LitElement implements HaFormElement {
 
   private _valueChanged(ev: Event) {
     const source = ev.target as TextField;
-    const rawValue = source.value;
+    const rawValue = source.value.replace(",", ".");
 
     let value: number | undefined;
 
+    if (rawValue.endsWith(".")) {
+      return;
+    }
+
     if (rawValue !== "") {
       value = parseFloat(rawValue);
+      if (isNaN(value)) {
+        value = undefined;
+      }
     }
 
     // Detect anything changed
@@ -61,7 +68,6 @@ export class HaFormFloat extends LitElement implements HaFormElement {
       const newRawValue = value === undefined ? "" : String(value);
       if (source.value !== newRawValue) {
         source.value = newRawValue;
-        return;
       }
       return;
     }
diff --git a/src/panels/lovelace/cards/hui-logbook-card.ts b/src/panels/lovelace/cards/hui-logbook-card.ts
index c9c4befabb..ae459a11d3 100644
--- a/src/panels/lovelace/cards/hui-logbook-card.ts
+++ b/src/panels/lovelace/cards/hui-logbook-card.ts
@@ -241,7 +241,7 @@ export class HuiLogbookCard extends LitElement implements LovelaceCard {
     );
     const lastDate = this._lastLogbookDate || hoursToShowDate;
     const now = new Date();
-    let newEntries;
+    let newEntries: LogbookEntry[];
 
     try {
       [newEntries] = await Promise.all([
@@ -256,6 +256,7 @@ export class HuiLogbookCard extends LitElement implements LovelaceCard {
       ]);
     } catch (err: any) {
       this._error = err.message;
+      return;
     }
 
     const logbookEntries = this._logbookEntries