diff --git a/fault-monitor/fru-fault-monitor.cpp b/fault-monitor/fru-fault-monitor.cpp
index dc2f231..4b74462 100644
--- a/fault-monitor/fru-fault-monitor.cpp
+++ b/fault-monitor/fru-fault-monitor.cpp
@@ -3,6 +3,8 @@
 #include "xyz/openbmc_project/Led/Mapper/error.hpp"
 #include "elog-errors.hpp"
 #include "fru-fault-monitor.hpp"
+#include <phosphor-logging/elog-errors.hpp>
+#include "xyz/openbmc_project/Common/error.hpp"
 
 namespace phosphor
 {
@@ -23,6 +25,7 @@
 constexpr auto OBJMGR_IFACE     = "org.freedesktop.DBus.ObjectManager";
 constexpr auto LED_GROUPS       = "/xyz/openbmc_project/led/groups/";
 constexpr auto LOG_PATH         = "/xyz/openbmc_project/logging";
+constexpr auto LOG_IFACE        = "xyz.openbmc_project.Logging.Entry";
 
 using AssociationList = std::vector<std::tuple<
                         std::string, std::string, std::string>>;
@@ -33,6 +36,15 @@
 using PropertyMap = std::map<PropertyName, AttributeMap>;
 using LogEntryMsg = std::pair<sdbusplus::message::object_path, PropertyMap>;
 
+using Service = std::string;
+using Path = std::string;
+using Interface = std::string;
+using Interfaces = std::vector<Interface>;
+using MapperResponseType = std::map<Path, std::map<Service, Interfaces>>;
+
+using InternalFailure =
+    sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+
 using MethodErr  =
     sdbusplus::xyz::openbmc_project::Led::Mapper::Error::MethodError;
 using ObjectNotFoundErr =
@@ -161,15 +173,88 @@
     {
         if (std::get<1>(item).compare(CALLOUT_REV_ASSOCIATION) == 0)
         {
-            action(bus, std::get<2>(item), true);
             removeWatches.emplace_back(
                 std::make_unique<Remove>(bus, std::get<2>(item)));
+            action(bus, std::get<2>(item), true);
         }
     }
 
     return;
 }
 
+void Add::processExistingCallouts(sdbusplus::bus::bus& bus)
+{
+    auto depth = 0;
+    auto mapperCall = bus.new_method_call(MAPPER_BUSNAME,
+                                          MAPPER_OBJ_PATH,
+                                          MAPPER_IFACE,
+                                          "GetSubTree");
+    mapperCall.append("/");
+    mapperCall.append(depth);
+    mapperCall.append(std::vector<Interface>({LOG_IFACE}));
+
+    auto mapperResponseMsg = bus.call(mapperCall);
+    if (mapperResponseMsg.is_method_error())
+    {
+        using namespace xyz::openbmc_project::Led::Mapper;
+        report<MethodErr>(
+            MethodError::METHOD_NAME("GetSubTree"),
+            MethodError::PATH(MAPPER_OBJ_PATH),
+            MethodError::INTERFACE(
+                OBJMGR_IFACE));
+        return;
+    }
+
+    MapperResponseType mapperResponse;
+    mapperResponseMsg.read(mapperResponse);
+    if (mapperResponse.empty())
+    {
+        using namespace xyz::openbmc_project::Led::Mapper;
+        report<ObjectNotFoundErr>(
+            ObjectNotFoundError::METHOD_NAME("GetSubTree"),
+            ObjectNotFoundError::PATH(MAPPER_OBJ_PATH),
+            ObjectNotFoundError::INTERFACE(
+                OBJMGR_IFACE));
+        return;
+    }
+
+    for (const auto& elem : mapperResponse)
+    {
+        auto method =  bus.new_method_call(elem.second.begin()->first.c_str(),
+                                           elem.first.c_str(),
+                                           "org.freedesktop.DBus.Properties",
+                                           "Get");
+        method.append("org.openbmc.Associations");
+        method.append("associations");
+        auto reply = bus.call(method);
+        if (reply.is_method_error())
+        {
+            //do not stop, continue with next elog
+            log<level::ERR>("Error in getting associations");
+            continue;
+        }
+
+        sdbusplus::message::variant<AssociationList> assoc;
+        reply.read(assoc);
+        auto& assocs = assoc.get<AssociationList>();
+        if (assocs.empty())
+        {
+            //no associations, skip
+            continue;
+        }
+
+        for (const auto& item : assocs)
+        {
+            if (std::get<1>(item).compare(CALLOUT_REV_ASSOCIATION) == 0)
+            {
+                removeWatches.emplace_back(
+                    std::make_unique<Remove>(bus, std::get<2>(item)));
+                action(bus, std::get<2>(item), true);
+            }
+        }
+    }
+}
+
 void Remove::removed(sdbusplus::message::message& msg)
 {
     auto bus = msg.get_bus();
diff --git a/fault-monitor/fru-fault-monitor.hpp b/fault-monitor/fru-fault-monitor.hpp
index b686560..897ef05 100644
--- a/fault-monitor/fru-fault-monitor.hpp
+++ b/fault-monitor/fru-fault-monitor.hpp
@@ -53,7 +53,7 @@
                 std::bind(std::mem_fn(&Add::created),
                           this, std::placeholders::_1))
         {
-            //Do nothing
+            processExistingCallouts(bus);
         }
     private:
 
@@ -66,6 +66,11 @@
          *  @param[in] msg       - Data associated with subscribed signal
          */
         void created(sdbusplus::message::message& msg);
+
+        /** @brief This function process all callouts at application start
+         *  @param[in] bus - The Dbus bus object
+         */
+        void processExistingCallouts(sdbusplus::bus::bus& bus);
 };
 
 /** @class Remove
