diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index 16ba928..2d1c68a 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -251,7 +251,7 @@
             auto method = bus.new_method_call(service.c_str(), logObjPath,
                                               logInterface, "HostAck");
             method.append(fileHandle);
-            bus.call_noreply(method);
+            bus.call_noreply(method, dbusTimeout);
         }
         catch (const std::exception& e)
         {
@@ -286,7 +286,7 @@
             auto method = bus.new_method_call(service.c_str(), logObjPath,
                                               logInterface, "HostReject");
             method.append(fileHandle, reason);
-            bus.call_noreply(method);
+            bus.call_noreply(method, dbusTimeout);
         }
         catch (const std::exception& e)
         {
@@ -323,7 +323,7 @@
                                           logInterface, "Create");
         method.append("xyz.openbmc_project.Host.Error.Event", severity,
                       addlData);
-        bus.call_noreply(method);
+        bus.call_noreply(method, dbusTimeout);
     }
     catch (const std::exception& e)
     {
