diff --git a/firmware-arduino/src/Config.h b/firmware-arduino/src/Config.h
index 902ed46..981a654 100644
--- a/firmware-arduino/src/Config.h
+++ b/firmware-arduino/src/Config.h
@@ -23,6 +23,7 @@ extern OtaStatus otaState;
 enum DeviceState
 {
     SETUP,
+    SOFT_AP,
     IDLE,
     LISTENING,
     SPEAKING,
diff --git a/firmware-arduino/src/LEDHandler.cpp b/firmware-arduino/src/LEDHandler.cpp
index 9a0faf3..3fee3dd 100644
--- a/firmware-arduino/src/LEDHandler.cpp
+++ b/firmware-arduino/src/LEDHandler.cpp
@@ -309,6 +309,9 @@ void ledTask(void *parameter)
         case IDLE:
             setStaticColor(StaticColor::GREEN);
             break;
+        case SOFT_AP:
+            setStaticColor(StaticColor::MAGENTA);
+            break;
         case PROCESSING:
             setStaticColor(StaticColor::RED);
             break;
diff --git a/firmware-arduino/src/WifiManager.cpp b/firmware-arduino/src/WifiManager.cpp
index fb4bef0..0b94668 100644
--- a/firmware-arduino/src/WifiManager.cpp
+++ b/firmware-arduino/src/WifiManager.cpp
@@ -151,6 +151,7 @@ WIFIMANAGER::WIFIMANAGER(const char * ns) {
   WiFi.onEvent([&](WiFiEvent_t event, WiFiEventInfo_t info) {
     logMessage("[WIFI] onEvent() AP mode started!\n");
     softApRunning = true;
+    deviceState = SOFT_AP;
 #if ESP_ARDUINO_VERSION_MAJOR >= 2
     }, ARDUINO_EVENT_WIFI_AP_START); // arduino-esp32 2.0.0 and later
 #else
@@ -159,6 +160,7 @@ WIFIMANAGER::WIFIMANAGER(const char * ns) {
   WiFi.onEvent([&](WiFiEvent_t event, WiFiEventInfo_t info) {
     logMessage("[WIFI] onEvent() AP mode stopped!\n");
     softApRunning = false;
+    deviceState = IDLE;
 #if ESP_ARDUINO_VERSION_MAJOR >= 2
     }, ARDUINO_EVENT_WIFI_AP_STOP); // arduino-esp32 2.0.0 and later
 #else