diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
index 269f574..0889fcb 100644
--- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
@@ -15,10 +15,8 @@
     ${PN}-host-check \
     ${PN}-reset-sensor-states \
 "
-PACKAGES =+ "${STATE_MGR_PACKAGES}"
-PACKAGES_remove = "${PN}"
-RDEPENDS_${PN}-dev = "${STATE_MGR_PACKAGES}"
-RDEPENDS_${PN}-staticdev = "${STATE_MGR_PACKAGES}"
+PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}"
+ALLOW_EMPTY_${PN} = "1"
 
 DBUS_PACKAGES = "${STATE_MGR_PACKAGES}"