diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 190febb..1a7fc7f 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -332,11 +332,7 @@ void WiFiManager::setupConfigPortal() {
 
   // setup dns and web servers
   dnsServer.reset(new DNSServer());
-  #if defined(ESP32) && defined(WEBSERVERSHIM)
-    server.reset(new WebServer(80));
-  #else
-    server.reset(new ESP8266WebServer(80));
-  #endif
+  server.reset(new WM_WebServer(80));
 
   /* Setup the DNS server redirecting all the domains to the apIP */
   dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
diff --git a/WiFiManager.h b/WiFiManager.h
index 5b4f445..754764e 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -189,10 +189,11 @@ class WiFiManager
     std::unique_ptr<DNSServer>        dnsServer;
 
     #if defined(ESP32) && defined(WEBSERVERSHIM)
-        std::unique_ptr<WebServer> server;
+        using WM_WebServer = WebServer;
     #else
-        std::unique_ptr<ESP8266WebServer> server;
+        using WM_WebServer = ESP8266WebServer;
     #endif
+        std::unique_ptr<WM_WebServer> server;
 
     // ip configs
     IPAddress     _ap_static_ip;