diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
index edcd8f2..ac8f4de 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
@@ -25,3 +25,6 @@
 #These 2 services are protected by the watchdog
 SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
 SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
+
+#This service needs to be stopped when watchdog expires
+SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
new file mode 100644
index 0000000..90b1e81
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
@@ -0,0 +1,2 @@
+[Unit]
+Conflicts=obmc-fan-watchdog-takeover.target