diff --git a/Software/MainBoard/rust/src/main.rs b/Software/MainBoard/rust/src/main.rs
index 01f0031..0f65180 100644
--- a/Software/MainBoard/rust/src/main.rs
+++ b/Software/MainBoard/rust/src/main.rs
@@ -904,10 +904,22 @@ async fn try_connect_wifi_sntp_mqtt(
             } else {
                 false
             };
+
+            let ip = match stack.config_v4() {
+                Some(config) => config.address.address().to_string(),
+                None =>  {
+                    match stack.config_v6() {
+                        Some(config) => config.address.address().to_string(),
+                        None =>  {
+                            String::from("No IP")
+                        }
+                    }
+                },
+            };
             NetworkMode::Wifi {
                 sntp: sntp_mode,
                 mqtt: mqtt_connected,
-                ip_address: stack.hardware_address().to_string(),
+                ip_address: ip,
             }
         }
         Err(err) => {