diff --git a/firmware/esp32-s3-dashboard/dashboard_config.h b/firmware/esp32-s3-dashboard/dashboard_config.h
index 54265b3..1d112a3 100644
--- a/firmware/esp32-s3-dashboard/dashboard_config.h
+++ b/firmware/esp32-s3-dashboard/dashboard_config.h
@@ -3,6 +3,6 @@
 static const char *DASHBOARD_VERSION = "0.1.127-first-boot-wifi";
 
 // First-boot defaults. Credentials are stored in Preferences/NVS after setup.
-static const char *DASHBOARD_DEFAULT_CARGO_WIFI_SSID = "";
+static const char *DASHBOARD_DEFAULT_CARGO_WIFI_SSID = "OverlandController";
 static const char *DASHBOARD_DEFAULT_CARGO_WIFI_PASSWORD = "";
 static const char *DASHBOARD_DEFAULT_CARGO_API_BASE_URL = "http://192.168.4.1";
diff --git a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino
index 5c13bc3..ddc2090 100644
--- a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino
+++ b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino
@@ -1194,12 +1194,16 @@ static void load_dashboard_connection_config()
 {
     dashboard_preferences.begin("dashcfg", false);
 
+    bool has_saved_ssid = dashboard_preferences.isKey("wifi_ssid");
+
     cargo_wifi_ssid = dashboard_preferences.getString("wifi_ssid", DASHBOARD_DEFAULT_CARGO_WIFI_SSID);
     cargo_wifi_password = dashboard_preferences.getString("wifi_pass", DASHBOARD_DEFAULT_CARGO_WIFI_PASSWORD);
     cargo_api_base_url = dashboard_preferences.getString("api_base", DASHBOARD_DEFAULT_CARGO_API_BASE_URL);
 
     rebuild_cargo_api_urls();
-    dashboard_configured = cargo_wifi_ssid.length() > 0;
+
+    // Only skip setup after the user has explicitly saved settings.
+    dashboard_configured = has_saved_ssid;
 
     Serial.print("Dashboard cargo SSID configured: ");
     Serial.println(dashboard_configured ? "yes" : "no");