diff --git a/.clang-tidy.hash b/.clang-tidy.hash
index 40e96c68a6..f59d683d3a 100644
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-d7d806925e18aeccf22a4f12e2c1f3f4ab49275c6bd1ab3b1e046852afd77f0b
+d445cd2edd41f7c6915b66491a06fcc6680fe348ac8e65c42256eb20c78f700c
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 4be653c362..e0eec7dedb 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -48,5 +48,4 @@ async def to_code(config):
         if CORE.is_libretiny:
             CORE.add_platformio_option("lib_ignore", ["ESPAsyncTCP", "RPAsyncTCP"])
         # https://github.com/ESP32Async/ESPAsyncWebServer/blob/main/library.json
-        # Testing PR #370 for ESP8266 SSE crash fix
-        cg.add_library("https://github.com/bdraco/ESPAsyncWebServer.git#pr-370", None)
+        cg.add_library("ESP32Async/ESPAsyncWebServer", "3.9.5")
diff --git a/platformio.ini b/platformio.ini
index 135665bff5..1495a6dfc9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -114,7 +114,7 @@ lib_deps =
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
     ESP32Async/ESPAsyncTCP@2.0.0          ; async_tcp
-    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
     makuna/NeoPixelBus@2.7.3              ; neopixelbus
     ESP8266HTTPClient                     ; http_request (Arduino built-in)
     ESP8266mDNS                           ; mdns (Arduino built-in)
@@ -201,7 +201,7 @@ framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
     bblanchon/ArduinoJson@7.4.2           ; json
-    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_RP2040
@@ -217,7 +217,7 @@ framework = arduino
 lib_compat_mode = soft
 lib_deps =
     bblanchon/ArduinoJson@7.4.2           ; json
-    ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
+    ESP32Async/ESPAsyncWebServer@3.9.5    ; web_server_base
     droscy/esp_wireguard@0.4.2            ; wireguard
 build_flags =
     ${common:arduino.build_flags}