diff --git a/src/dialogs/config-flow/step-flow-create-entry.ts b/src/dialogs/config-flow/step-flow-create-entry.ts
index 32fb7f09cb..a43477d8c0 100644
--- a/src/dialogs/config-flow/step-flow-create-entry.ts
+++ b/src/dialogs/config-flow/step-flow-create-entry.ts
@@ -63,6 +63,7 @@ class StepFlowCreateEntry extends LitElement {
                         <ha-area-picker
                           .hass=${this.hass}
                           .device=${device.id}
+                          .value=${device.area_id ?? undefined}
                           @value-changed=${this._areaPicked}
                         ></ha-area-picker>
                       </div>