diff --git a/include/HwmonTempSensor.hpp b/include/HwmonTempSensor.hpp
index e041085..5124260 100644
--- a/include/HwmonTempSensor.hpp
+++ b/include/HwmonTempSensor.hpp
@@ -7,7 +7,8 @@
 #include <string>
 #include <vector>
 
-class HwmonTempSensor : public Sensor
+class HwmonTempSensor : public Sensor,
+                        public std::enable_shared_from_this<HwmonTempSensor>
 {
   public:
     HwmonTempSensor(const std::string& path, const std::string& objectType,
@@ -18,6 +19,7 @@
                     const std::string& sensorConfiguration,
                     const PowerState powerState);
     ~HwmonTempSensor();
+    void setupRead(void);
 
   private:
     sdbusplus::asio::object_server& objServer;
@@ -27,7 +29,7 @@
     std::string path;
     PowerState readState;
     size_t errCount;
-    void setupRead(void);
+
     void handleResponse(const boost::system::error_code& err);
     void checkThresholds(void) override;
 };
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index 55d4508..a7316e9 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -51,7 +51,7 @@
 
 void createSensors(
     boost::asio::io_service& io, sdbusplus::asio::object_server& objectServer,
-    boost::container::flat_map<std::string, std::unique_ptr<HwmonTempSensor>>&
+    boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>&
         sensors,
     std::shared_ptr<sdbusplus::asio::connection>& dbusConnection,
     const std::unique_ptr<boost::container::flat_set<std::string>>&
@@ -211,11 +211,11 @@
                 }
                 auto& sensor = sensors[sensorName];
                 sensor = nullptr;
-                sensor = std::make_unique<HwmonTempSensor>(
+                sensor = std::make_shared<HwmonTempSensor>(
                     directory.string() + "/temp1_input", sensorType,
                     objectServer, dbusConnection, io, sensorName,
                     std::move(sensorThresholds), *interfacePath, readState);
-
+                sensor->setupRead();
                 // Looking for keys like "Name1" for temp2_input,
                 // "Name2" for temp3_input, etc.
                 int i = 0;
@@ -233,12 +233,13 @@
                         std::get<std::string>(findKey->second);
                     auto& sensor = sensors[sensorName];
                     sensor = nullptr;
-                    sensor = std::make_unique<HwmonTempSensor>(
+                    sensor = std::make_shared<HwmonTempSensor>(
                         directory.string() + "/temp" + std::string(1, '1' + i) +
                             "_input",
                         sensorType, objectServer, dbusConnection, io,
                         sensorName, std::vector<thresholds::Threshold>(),
                         *interfacePath, readState);
+                    sensor->setupRead();
                 }
             }
         }));
@@ -252,7 +253,7 @@
     auto systemBus = std::make_shared<sdbusplus::asio::connection>(io);
     systemBus->request_name("xyz.openbmc_project.HwmonTempSensor");
     sdbusplus::asio::object_server objectServer(systemBus);
-    boost::container::flat_map<std::string, std::unique_ptr<HwmonTempSensor>>
+    boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>
         sensors;
     std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
     std::unique_ptr<boost::container::flat_set<std::string>> sensorsChanged =
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index f110b37..9f9448a 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -47,8 +47,9 @@
     Sensor(boost::replace_all_copy(sensorName, " ", "_"),
            std::move(_thresholds), sensorConfiguration, objectType, maxReading,
            minReading),
-    objServer(objectServer), inputDev(io, open(path.c_str(), O_RDONLY)),
-    waitTimer(io), path(path), errCount(0), readState(powerState)
+    std::enable_shared_from_this<HwmonTempSensor>(), objServer(objectServer),
+    inputDev(io, open(path.c_str(), O_RDONLY)), waitTimer(io), path(path),
+    errCount(0), readState(powerState)
 {
     sensorInterface = objectServer.add_interface(
         "/xyz/openbmc_project/sensors/temperature/" + name,
@@ -71,7 +72,6 @@
         association::interface);
     setInitialProperties(conn);
     setupPowerMatch(conn);
-    setupRead();
 }
 
 HwmonTempSensor::~HwmonTempSensor()
@@ -87,15 +87,24 @@
 
 void HwmonTempSensor::setupRead(void)
 {
-    boost::asio::async_read_until(
-        inputDev, readBuf, '\n',
-        [&](const boost::system::error_code& ec,
-            std::size_t /*bytes_transfered*/) { handleResponse(ec); });
+    std::weak_ptr<HwmonTempSensor> weakRef = weak_from_this();
+
+    boost::asio::async_read_until(inputDev, readBuf, '\n',
+                                  [weakRef](const boost::system::error_code& ec,
+                                            std::size_t /*bytes_transfered*/) {
+                                      std::shared_ptr<HwmonTempSensor> self =
+                                          weakRef.lock();
+                                      if (self)
+                                      {
+                                          self->handleResponse(ec);
+                                      }
+                                  });
 }
 
 void HwmonTempSensor::handleResponse(const boost::system::error_code& err)
 {
-    if (err == boost::system::errc::bad_file_descriptor)
+    if ((err == boost::system::errc::bad_file_descriptor) ||
+        (err == boost::asio::error::misc_errors::not_found))
     {
         return; // we're being destroyed
     }
@@ -146,12 +155,17 @@
     }
     inputDev.assign(fd);
     waitTimer.expires_from_now(boost::posix_time::milliseconds(sensorPollMs));
-    waitTimer.async_wait([&](const boost::system::error_code& ec) {
+    std::weak_ptr<HwmonTempSensor> weakRef = weak_from_this();
+    waitTimer.async_wait([weakRef](const boost::system::error_code& ec) {
+        std::shared_ptr<HwmonTempSensor> self = weakRef.lock();
         if (ec == boost::asio::error::operation_aborted)
         {
             return; // we're being canceled
         }
-        setupRead();
+        if (self)
+        {
+            self->setupRead();
+        }
     });
 }