diff --git a/CHANGELOG.md b/CHANGELOG.md
index e71800c8..d3eea2b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated communications overview picture.
 - Updated kit purchasing links. 
 - MIN_ERG_CADENCE created and changed from 20 to 30.
+- Fixed DNS server in AP mode.
 
 ### Hardware
 - Wire diameter reduced from 7.2mm to 6.0mm on the window passthrough to accommodate the latest batch of cables. 
diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
index 6f2ccb84..0c53dcbd 100644
--- a/src/HTTP_Server_Basic.cpp
+++ b/src/HTTP_Server_Basic.cpp
@@ -406,7 +406,7 @@ void HTTP_Server::webClientUpdate(void *pvParameters) {
   for (;;) {
     server.handleClient();
     vTaskDelay(WEBSERVER_DELAY / portTICK_RATE_MS);
-    if (WiFi.getMode() == WIFI_AP) {
+    if (WiFi.getMode() != WIFI_MODE_STA) {
       dnsServer.processNextRequest();
     }
     // Keep MDNS alive