diff --git a/code/espurna/wifi.h b/code/espurna/wifi.h
index f540e816..2449f7bb 100644
--- a/code/espurna/wifi.h
+++ b/code/espurna/wifi.h
@@ -91,6 +91,14 @@ enum class ApMode {
 };
 
 } // namespace wifi
+
+namespace settings {
+namespace internal {
+
+String serialize(wifi::Mac);
+
+} // namespace internal
+} // namespace settings
 } // namespace espurna
 
 // Note that 'connected' status is *only* for the WiFi STA.
diff --git a/code/espurna/ws.cpp b/code/espurna/ws.cpp
index a0a0174d..4d98840c 100644
--- a/code/espurna/ws.cpp
+++ b/code/espurna/ws.cpp
@@ -179,7 +179,8 @@ void _wsUpdateSta(JsonObject& root) {
     }
 
     root[F("ssid")] = network.ssid;
-    root[F("bssid")] = network.bssid;
+    root[F("bssid")] =
+        ::espurna::settings::internal::serialize(network.bssid);
     root[F("channel")] = network.channel;
     root[F("staip")] = ip.toString();
 }