diff --git a/callout.cpp b/callout.cpp
index 3f409f9..1d95036 100644
--- a/callout.cpp
+++ b/callout.cpp
@@ -83,7 +83,7 @@
 
 Callout::Callout(sdbusplus::bus::bus& bus, const std::string& objectPath,
                  size_t id, uint64_t timestamp) :
-    CalloutObject(bus, objectPath.c_str(), true),
+    CalloutObject(bus, objectPath.c_str(), CalloutObject::action::defer_emit),
     entryID(id), timestamp(timestamp)
 {
 }
@@ -91,7 +91,7 @@
 Callout::Callout(sdbusplus::bus::bus& bus, const std::string& objectPath,
                  const std::string& inventoryPath, size_t id,
                  uint64_t timestamp, const DbusPropertyMap& properties) :
-    CalloutObject(bus, objectPath.c_str(), true),
+    CalloutObject(bus, objectPath.c_str(), CalloutObject::action::defer_emit),
     entryID(id), timestamp(timestamp)
 {
     path(inventoryPath);
diff --git a/manager.cpp b/manager.cpp
index aa8d5e0..4c8e4a0 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -164,7 +164,8 @@
 {
     auto values = policy::find(policies, properties);
 
-    auto object = std::make_shared<PolicyObject>(bus, objectPath.c_str(), true);
+    auto object = std::make_shared<PolicyObject>(
+        bus, objectPath.c_str(), PolicyObject::action::defer_emit);
 
     object->eventID(std::get<policy::EIDField>(values));
     object->description(std::get<policy::MsgField>(values));