diff --git a/include/wifi_utils.h b/include/wifi_utils.h
index a7540f8..be2e035 100644
--- a/include/wifi_utils.h
+++ b/include/wifi_utils.h
@@ -27,7 +27,6 @@ namespace WIFI_Utils {
     void checkWiFi();
     void startAutoAP();
     void startWiFi();
-    void checkAutoAPTimeout();
     void setup();
 
 }
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 4a57ef3..670b1f5 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -106,6 +106,7 @@ void setup() {
     Serial.begin(115200);
     networkManager = new NetworkManager();
     networkManager->setup();
+    networkManager->setAPTimeout(Config.wifiAutoAP.timeout * 60 * 1000); // Convert minutes to milliseconds
     POWER_Utils::setup();
     Utils::setupDisplay();
     LoRa_Utils::setup();
@@ -137,7 +138,6 @@ void loop() {
         Utils::checkSleepByLowBatteryVoltage(1);
         SLEEP_Utils::startSleeping();
     } else {
-        WIFI_Utils::checkAutoAPTimeout();
         networkManager->loop();
 
         if (isUpdatingOTA) {
diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp
index ca7efa6..5fabf77 100644
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -34,7 +34,6 @@ extern WiFi_AP          *currentWiFi;
 extern bool             backupDigiMode;
 extern uint32_t         lastServerCheck;
 
-uint32_t    WiFiAutoAPTime      = millis();
 uint8_t     wifiCounter         = 0;
 uint32_t    lastBackupDigiTime  = millis();
 uint32_t    lastWiFiCheck       = 0;
@@ -83,7 +82,6 @@ namespace WIFI_Utils {
     void startAutoAP() {
         displayShow("", "   Starting Auto AP", " Please connect to it " , "     loading ...", 1000);
         networkManager->setupAP(Config.callsign + "-AP", Config.wifiAutoAP.password);
-        WiFiAutoAPTime = millis();
     }
 
     void startWiFi() {
@@ -127,24 +125,6 @@ namespace WIFI_Utils {
         }
     }
 
-    void checkAutoAPTimeout() {
-        if (networkManager->isWifiAPActive() && Config.wifiAutoAP.timeout > 0) {
-            if (WiFi.softAPgetStationNum() > 0) {
-                WiFiAutoAPTime = 0;
-            } else {
-                if (WiFiAutoAPTime == 0) {
-                    WiFiAutoAPTime = millis();
-                } else if ((millis() - WiFiAutoAPTime) > Config.wifiAutoAP.timeout * 60 * 1000) {
-                    Serial.println("Stopping auto AP");
-
-                    networkManager->disableAP();
-
-                    Serial.println("Auto AP stopped (timeout)");
-                }
-            }
-        }
-    }
-
     void setup() {
         if (Config.digi.ecoMode == 0) startWiFi();
         btStop();