diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index f58f0e2..69bdf45 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -1438,6 +1438,8 @@
     {
         record.body.upper_critical_threshold = *thresholdData.criticalHigh;
         record.body.supported_deassertions[1] |= static_cast<uint8_t>(
+            IPMISensorEventEnableThresholds::criticalThreshold);
+        record.body.supported_deassertions[1] |= static_cast<uint8_t>(
             IPMISensorEventEnableThresholds::upperCriticalGoingHigh);
         record.body.supported_assertions[1] |= static_cast<uint8_t>(
             IPMISensorEventEnableThresholds::upperCriticalGoingHigh);
@@ -1447,6 +1449,8 @@
     if (thresholdData.warningHigh)
     {
         record.body.upper_noncritical_threshold = *thresholdData.warningHigh;
+        record.body.supported_deassertions[1] |= static_cast<uint8_t>(
+            IPMISensorEventEnableThresholds::nonCriticalThreshold);
         record.body.supported_deassertions[0] |= static_cast<uint8_t>(
             IPMISensorEventEnableThresholds::upperNonCriticalGoingHigh);
         record.body.supported_assertions[0] |= static_cast<uint8_t>(
@@ -1457,6 +1461,8 @@
     if (thresholdData.criticalLow)
     {
         record.body.lower_critical_threshold = *thresholdData.criticalLow;
+        record.body.supported_assertions[1] |= static_cast<uint8_t>(
+            IPMISensorEventEnableThresholds::criticalThreshold);
         record.body.supported_deassertions[0] |= static_cast<uint8_t>(
             IPMISensorEventEnableThresholds::lowerCriticalGoingLow);
         record.body.supported_assertions[0] |= static_cast<uint8_t>(
@@ -1467,6 +1473,8 @@
     if (thresholdData.warningLow)
     {
         record.body.lower_noncritical_threshold = *thresholdData.warningLow;
+        record.body.supported_assertions[1] |= static_cast<uint8_t>(
+            IPMISensorEventEnableThresholds::nonCriticalThreshold);
         record.body.supported_deassertions[0] |= static_cast<uint8_t>(
             IPMISensorEventEnableThresholds::lowerNonCriticalGoingLow);
         record.body.supported_assertions[0] |= static_cast<uint8_t>(