diff --git a/static/js/views/settings.js b/static/js/views/settings.js
index 9c3bf7b13..e79a6158e 100644
--- a/static/js/views/settings.js
+++ b/static/js/views/settings.js
@@ -590,8 +590,7 @@ const SettingsScreen = {
   },
 
   validateWifi: function () {
-    const valid = this.elements.network.client.wifi.password.value.length >= 8;
-
+    const valid = (this.elements.network.client.wifi.password.value.length == 0 || this.elements.network.client.wifi.password.value.length >= 8);
     this.elements.network.client.wifi.connect.disabled = !valid;
   },