diff --git a/src/main.cpp b/src/main.cpp
index 987e08248..5840e5693 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -345,6 +345,11 @@ void setup()
     digitalWrite(USER_LED, LOW);
 #endif
 
+#ifdef WIFI_LED
+    pinMode(WIFI_LED, OUTPUT);
+    digitalWrite(WIFI_LED, LOW);
+#endif
+
 #ifdef BLE_LED
     pinMode(BLE_LED, OUTPUT);
     digitalWrite(BLE_LED, LOW);
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 789f8ac44..945460c28 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -327,9 +327,15 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     case ARDUINO_EVENT_WIFI_STA_CONNECTED:
         LOG_INFO("Connected to access point");
+#ifdef WIFI_LED
+        digitalWrite(WIFI_LED, HIGH);
+#endif
         break;
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
         LOG_INFO("Disconnected from WiFi access point");
+#ifdef WIFI_LED
+        digitalWrite(WIFI_LED, LOW);
+#endif
         if (!isReconnecting) {
             WiFi.disconnect(false, true);
             syslog.disable();
@@ -378,9 +384,15 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     case ARDUINO_EVENT_WIFI_AP_START:
         LOG_INFO("WiFi access point started");
+#ifdef WIFI_LED
+        digitalWrite(WIFI_LED, HIGH);
+#endif
         break;
     case ARDUINO_EVENT_WIFI_AP_STOP:
         LOG_INFO("WiFi access point stopped");
+#ifdef WIFI_LED
+        digitalWrite(WIFI_LED, LOW);
+#endif
         break;
     case ARDUINO_EVENT_WIFI_AP_STACONNECTED:
         LOG_INFO("Client connected");
@@ -474,4 +486,4 @@ uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
 }
-#endif
\ No newline at end of file
+#endif