diff --git a/recipes-phosphor/sensors/dbus-sensors/50-gbmc-override.conf b/recipes-phosphor/sensors/dbus-sensors/50-gbmc-override.conf
new file mode 100644
index 0000000..2995e3f
--- /dev/null
+++ b/recipes-phosphor/sensors/dbus-sensors/50-gbmc-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=!/run/powercycle_ongoing
diff --git a/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 6e1cf0a..231fb04 100644
--- a/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,7 @@
 FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
 
 SRC_URI:append:gbmc = " \
+  file://50-gbmc-override.conf \
   file://0002-psusensor-attempt-to-re-open-hwmon-files-if-reading-.patch \
   file://0003-gpiosensor-a-dedicated-daemon-to-report-gpio-status-.patch \
   file://0004-Feature-Add-association-interfaces-to-a-target-EM.patch \
@@ -31,3 +32,13 @@
 PACKAGECONFIG[redfishsensor] = "-Dredfish=enabled, -Dredfish=disabled"
 SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', \
   'redfishsensor', 'xyz.openbmc_project.redfishsensor.service', '', d)}"
+
+FILES:${PN}:append:gbmc = " \
+    ${systemd_system_unitdir}/xyz.openbmc_project.psusensor.service.d/50-gbmc-override.conf \
+"
+
+do_install:append:gbmc() {
+    install -d -m0644 ${D}${systemd_system_unitdir}/xyz.openbmc_project.psusensor.service.d/
+    install -m0644 ${WORKDIR}/50-gbmc-override.conf \
+      ${D}${systemd_system_unitdir}/xyz.openbmc_project.psusensor.service.d/
+}