diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index aa8b8c9..c98c454 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -189,7 +189,6 @@
             return;
         }
         thisReq.session = userSession;
-        res.keepAlive(thisReq.keepAlive());
 
         // Fetch the client IP address
         readClientIp();
@@ -221,6 +220,7 @@
             completeRequest(res);
             return;
         }
+        keepAlive = thisReq.keepAlive();
 #ifndef BMCWEB_INSECURE_DISABLE_AUTHX
         if (!crow::authentication::isOnAllowlist(req->url, req->method()) &&
             thisReq.session == nullptr)
@@ -302,9 +302,10 @@
             return;
         }
         res = std::move(thisRes);
+        res.keepAlive(keepAlive);
 
         BMCWEB_LOG_INFO << "Response: " << this << ' ' << req->url << ' '
-                        << res.resultInt() << " keepalive=" << res.keepAlive();
+                        << res.resultInt() << " keepalive=" << keepAlive;
 
         addSecurityHeaders(*req, res);
 
@@ -534,7 +535,7 @@
                 BMCWEB_LOG_DEBUG << this << " from write(2)";
                 return;
             }
-            if (!serializer->get().keep_alive())
+            if (!keepAlive)
             {
                 close();
                 BMCWEB_LOG_DEBUG << this << " from write(1)";
@@ -633,6 +634,8 @@
 
     boost::asio::steady_timer timer;
 
+    bool keepAlive = true;
+
     std::function<std::string()>& getCachedDateStr;
 
     using std::enable_shared_from_this<