diff --git a/common/recipes-phosphor/dbus/phosphor-mapper.bb b/common/recipes-phosphor/dbus/phosphor-mapper.bb
index 9fcd1b9..e3bfbf1 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper.bb
+++ b/common/recipes-phosphor/dbus/phosphor-mapper.bb
@@ -14,7 +14,7 @@
 DEPENDS += "autoconf-archive-native"
 
 DBUS_SERVICE_${PN} += "xyz.openbmc_project.ObjectMapper.service"
-SYSTEMD_SERVICE_${PN} = "mapper-wait@.service"
+SYSTEMD_SERVICE_${PN} = "mapper-wait@.service mapper-wait-until-removed@.service"
 RDEPENDS_libmapper += "libsystemd"
 RDEPENDS_${PN} += " \
         python-xml \