diff --git a/pid/builder.cpp b/pid/builder.cpp
index 08526fa..830c2fb 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -100,6 +100,7 @@
                 auto pid = FanController::createFanPid(zone.get(), name, inputs,
                                                        info.pidInfo);
                 zone->addFanPID(std::move(pid));
+                zone->addPidFailSafePercent(name, info.failSafePercent);
             }
             else if (isThermalType(info.type))
             {
@@ -117,6 +118,7 @@
                 zone->addPidControlProcess(name, modeControlBus,
                                            getPidControlPath(zoneId, name),
                                            deferSignals);
+                zone->addPidFailSafePercent(name, info.failSafePercent);
             }
             else if (info.type == "stepwise")
             {
@@ -131,6 +133,7 @@
                 zone->addPidControlProcess(name, modeControlBus,
                                            getPidControlPath(zoneId, name),
                                            deferSignals);
+                zone->addPidFailSafePercent(name, info.failSafePercent);
             }
 
             std::cerr << "inputs: ";
diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp
index 1122f09..57ea943 100644
--- a/pid/buildjson.cpp
+++ b/pid/buildjson.cpp
@@ -62,6 +62,14 @@
         derivativeCoeff->get_to(derivativeCoeffValue);
     }
 
+    auto failSafePercent = j.find("FailSafePercent");
+    auto failSafePercentValue = 0;
+    if (failSafePercent != j.end())
+    {
+        failSafePercent->get_to(failSafePercentValue);
+    }
+    c.failSafePercent = failSafePercentValue;
+
     if (c.type != "stepwise")
     {
         p.at("samplePeriod").get_to(c.pidInfo.ts);
diff --git a/pid/zone.cpp b/pid/zone.cpp
index b76fdec..a8c388a 100644
--- a/pid/zone.cpp
+++ b/pid/zone.cpp
@@ -405,6 +405,8 @@
         // Start all sensors in fail-safe mode.
         _failSafeSensors.insert(t);
     }
+    // Initialize Pid FailSafePercent
+    initPidFailSafePercent();
 }
 
 void DbusPidZone::dumpCache(void)
@@ -484,4 +486,34 @@
     return _pidsControlProcess[name]->enabled();
 }
 
+void DbusPidZone::initPidFailSafePercent(void)
+{
+    // Currently, find the max failsafe percent pwm settings from zone and
+    // controller, and assign it to zone failsafe percent.
+
+    _failSafePercent = _zoneFailSafePercent;
+    std::cerr << "zone: Zone" << _zoneId
+              << " zoneFailSafePercent: " << _zoneFailSafePercent << "\n";
+
+    for (const auto& [name, value] : _pidsFailSafePercent)
+    {
+        _failSafePercent = std::max(_failSafePercent, value);
+        std::cerr << "pid: " << name << " failSafePercent: " << value << "\n";
+    }
+
+    // when the final failsafe percent is zero , it indicate no failsafe
+    // percent is configured  , set it to 100% as the default setting.
+    if (_failSafePercent == 0)
+    {
+        _failSafePercent = 100;
+    }
+    std::cerr << "Final zone" << _zoneId
+              << " failSafePercent: " << _failSafePercent << "\n";
+}
+
+void DbusPidZone::addPidFailSafePercent(std::string name, double percent)
+{
+    _pidsFailSafePercent[name] = percent;
+}
+
 } // namespace pid_control
diff --git a/pid/zone.hpp b/pid/zone.hpp
index 9604c73..53d90fd 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -48,7 +48,7 @@
                          : ModeObject::action::emit_object_added),
         _zoneId(zone), _maximumSetPoint(),
         _minThermalOutputSetPt(minThermalOutput),
-        _failSafePercent(failSafePercent), _cycleTime(cycleTime), _mgr(mgr)
+        _zoneFailSafePercent(failSafePercent), _cycleTime(cycleTime), _mgr(mgr)
     {
         if (loggingEnabled)
         {
@@ -107,6 +107,9 @@
                               std::string objPath, bool defer);
     bool isPidProcessEnabled(std::string name);
 
+    void initPidFailSafePercent(void);
+    void addPidFailSafePercent(std::string name, double percent);
+
   private:
     template <bool fanSensorLogging>
     void processSensorInputs(const std::vector<std::string>& sensorInputs,
@@ -189,7 +192,10 @@
     bool _manualMode = false;
     bool _redundantWrite = false;
     const double _minThermalOutputSetPt;
-    const double _failSafePercent;
+    // Current fail safe Percent.
+    double _failSafePercent;
+    // Zone fail safe Percent setting by configuration.
+    const double _zoneFailSafePercent;
     const conf::CycleTime _cycleTime;
 
     std::set<std::string> _failSafeSensors;
@@ -206,6 +212,11 @@
     std::vector<std::unique_ptr<Controller>> _thermals;
 
     std::map<std::string, std::unique_ptr<ProcessObject>> _pidsControlProcess;
+    /*
+     * <key = pidname, value = pid failsafe percent>
+     * Pid fail safe Percent setting by each pid controller configuration.
+     */
+    std::map<std::string, double> _pidsFailSafePercent;
 };
 
 } // namespace pid_control