diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts
index 5d449a645736..df6af09a9932 100644
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -93,7 +93,10 @@ class DataEntryFlowDialog extends LitElement {
         );
       } catch (err: any) {
         this.closeDialog();
-        let message = err.message || err.body || "Unknown error";
+        const bodyMessage =
+          typeof err.body === "object" ? err.body?.message : err.body;
+        let message =
+          err.message || bodyMessage || err.error || "Unknown error";
         if (typeof message !== "string") {
           message = JSON.stringify(message);
         }
@@ -120,7 +123,10 @@ class DataEntryFlowDialog extends LitElement {
         );
       } catch (err: any) {
         this.closeDialog();
-        let message = err.message || err.body || "Unknown error";
+        const bodyMessage =
+          typeof err.body === "object" ? err.body?.message : err.body;
+        let message =
+          err.message || bodyMessage || err.error || "Unknown error";
         if (typeof message !== "string") {
           message = JSON.stringify(message);
         }
diff --git a/src/dialogs/config-flow/step-flow-create-entry.ts b/src/dialogs/config-flow/step-flow-create-entry.ts
index 632dc45cd646..04d9a351f1be 100644
--- a/src/dialogs/config-flow/step-flow-create-entry.ts
+++ b/src/dialogs/config-flow/step-flow-create-entry.ts
@@ -196,7 +196,10 @@ class StepFlowCreateEntry extends LitElement {
         <ha-button @click=${this._flowDone}
           >${localize(
             `ui.panel.config.integrations.config_flow.${
-              !this.devices.length || Object.keys(this._deviceUpdate).length
+              !this.devices.length ||
+              Object.values(this._deviceUpdate).some(
+                (update) => update.name || update.area
+              )
                 ? "finish"
                 : "finish_skip"
             }`