diff --git a/redfish-core/include/subscription.hpp b/redfish-core/include/subscription.hpp
index 2a3d73d..7fe2fdc 100644
--- a/redfish-core/include/subscription.hpp
+++ b/redfish-core/include/subscription.hpp
@@ -58,7 +58,8 @@
     ~Subscription() = default;
 
     // callback for subscription sendData
-    void resHandler(const crow::Response& res);
+    void resHandler(const std::shared_ptr<Subscription>& /*self*/,
+                    const crow::Response& res);
 
     void sendHeartbeatEvent();
     void scheduleNextHeartbeatEvent();
@@ -91,8 +92,8 @@
     std::shared_ptr<crow::ConnectionPolicy> policy;
     crow::sse_socket::Connection* sseConn = nullptr;
 
-    std::optional<crow::HttpClient> client;
     boost::asio::steady_timer hbTimer;
+    std::optional<crow::HttpClient> client;
 
   public:
     std::optional<filter_ast::LogicalAnd> filter;
diff --git a/redfish-core/src/subscription.cpp b/redfish-core/src/subscription.cpp
index c0416e3..f81fdc6 100644
--- a/redfish-core/src/subscription.cpp
+++ b/redfish-core/src/subscription.cpp
@@ -64,7 +64,8 @@
 {}
 
 // callback for subscription sendData
-void Subscription::resHandler(const crow::Response& res)
+void Subscription::resHandler(const std::shared_ptr<Subscription>& /*self*/,
+                              const crow::Response& res)
 {
     BMCWEB_LOG_DEBUG("Response handled with return code: {}", res.resultInt());
 
@@ -187,7 +188,8 @@
             static_cast<ensuressl::VerifyCertificate>(
                 userSub->verifyCertificate),
             httpHeadersCopy, boost::beast::http::verb::post,
-            std::bind_front(&Subscription::resHandler, this));
+            std::bind_front(&Subscription::resHandler, this,
+                            shared_from_this()));
         return true;
     }