diff --git a/src/helpers/web/WebPanelServer.cpp b/src/helpers/web/WebPanelServer.cpp
index c87f0842..186057d8 100644
--- a/src/helpers/web/WebPanelServer.cpp
+++ b/src/helpers/web/WebPanelServer.cpp
@@ -2645,9 +2645,9 @@ bool WebPanelServer::start() {
 void WebPanelServer::stop() {
   stopRedirectServer();
   if (_server != nullptr) {
-    WEB_PANEL_LOG("server stopped");
     httpd_ssl_stop(_server);
     _server = nullptr;
+    WEB_PANEL_LOG("server stopped");
   }
   _token[0] = 0;
   _last_activity_ms = 0;
@@ -2663,9 +2663,9 @@ bool WebPanelServer::hasSessionToken() const {
 
 void WebPanelServer::stopRedirectServer() {
   if (_redirect_server != nullptr) {
-    WEB_PANEL_LOG("redirect server stopped");
     httpd_stop(_redirect_server);
     _redirect_server = nullptr;
+    WEB_PANEL_LOG("redirect server stopped");
   }
 }
 
diff --git a/src/helpers/web/WebService.h b/src/helpers/web/WebService.h
index be6aa43e..a875f16a 100644
--- a/src/helpers/web/WebService.h
+++ b/src/helpers/web/WebService.h
@@ -21,7 +21,7 @@ public:
   void setNetworkStateProvider(NetworkStateProvider* network) { _network = network; }
 
   bool setWebEnabled(bool enabled);
-  bool isWebEnabled() const { return _prefs.web_enabled != 0; }
+  bool isWebEnabled() const { return _prefs.web_enabled != 0 || _panel.isRunning(); }
   bool setWebStatsEnabled(bool enabled);
   bool isWebStatsEnabled() const { return _prefs.web_stats_enabled != 0; }