diff --git a/package-lock.json b/package-lock.json
index ce665df..cd1e938 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "esp-web-tools",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "esp-web-tools",
-      "version": "4.0.2",
+      "version": "4.1.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@material/mwc-button": "^0.25.3",
diff --git a/package.json b/package.json
index 6892448..67f4ff8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esp-web-tools",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Web tools for ESP devices",
   "main": "dist/install-button.js",
   "repository": "https://github.com/esphome/web",
diff --git a/src/install-dialog.ts b/src/install-dialog.ts
index 4970e0e..329c0c8 100644
--- a/src/install-dialog.ts
+++ b/src/install-dialog.ts
@@ -272,18 +272,22 @@ class EwtInstallDialog extends LitElement {
         ${showSetupLinks
           ? html`
               <div class="dashboard-buttons">
-                <div>
-                  <a
-                    href=${this._client!.nextUrl}
-                    class="has-button"
-                    target="_blank"
-                    @click=${() => {
-                      this._state = "DASHBOARD";
-                    }}
-                  >
-                    <ewt-button label="Visit Device"></ewt-button>
-                  </a>
-                </div>
+                ${this._client!.nextUrl === undefined
+                  ? ""
+                  : html`
+                      <div>
+                        <a
+                          href=${this._client!.nextUrl}
+                          class="has-button"
+                          target="_blank"
+                          @click=${() => {
+                            this._state = "DASHBOARD";
+                          }}
+                        >
+                          <ewt-button label="Visit Device"></ewt-button>
+                        </a>
+                      </div>
+                    `}
                 ${!this._manifest.home_assistant_domain
                   ? ""
                   : html`
@@ -462,6 +466,7 @@ class EwtInstallDialog extends LitElement {
         <ewt-button
           slot="primaryAction"
           .label=${supportsImprov ? "Next" : "Close"}
+          .disabled=${this._client === undefined}
           dialogAction=${ifDefined(supportsImprov ? undefined : "close")}
           @click=${!supportsImprov
             ? undefined
@@ -632,7 +637,9 @@ class EwtInstallDialog extends LitElement {
         this._installState = state;
 
         if (state.state === FlashStateType.FINISHED) {
-          this._initialize().then(() => this.requestUpdate());
+          sleep(100)
+            .then(() => this._initialize())
+            .then(() => this.requestUpdate());
         }
       },
       this.port,
diff --git a/static/firmware_build/esp8266.bin b/static/firmware_build/esp8266.bin
index 7040b45..544ab31 100644
Binary files a/static/firmware_build/esp8266.bin and b/static/firmware_build/esp8266.bin differ
diff --git a/static/firmware_build/firmware.bin b/static/firmware_build/firmware.bin
index 3f3e092..c12b9e5 100644
Binary files a/static/firmware_build/firmware.bin and b/static/firmware_build/firmware.bin differ
diff --git a/static/firmware_build/manifest.json b/static/firmware_build/manifest.json
index e6afdc4..2091a7c 100644
--- a/static/firmware_build/manifest.json
+++ b/static/firmware_build/manifest.json
@@ -1,8 +1,7 @@
 {
   "name": "ESPHome",
-  "version": "2021.11.0-dev",
+  "version": "2021.12.0-dev",
   "home_assistant_domain": "esphome",
-  "new_install_skip_erase": true,
   "builds": [
     {
       "chipFamily": "ESP32",