diff --git a/src/network/juniper/common/screenos/snmp/mode/components/fan.pm b/src/network/juniper/common/screenos/snmp/mode/components/fan.pm
index d8a1c8f476..953d563ab7 100644
--- a/src/network/juniper/common/screenos/snmp/mode/components/fan.pm
+++ b/src/network/juniper/common/screenos/snmp/mode/components/fan.pm
@@ -24,8 +24,9 @@ use strict;
 use warnings;
 
 my %map_status = (
-    1 => 'active',
-    2 => 'inactive',
+    0 => 'Fail',
+    1 => 'Good',
+    2 => 'Not installed',
 );
 
 my $mapping = {
diff --git a/src/network/juniper/common/screenos/snmp/mode/hardware.pm b/src/network/juniper/common/screenos/snmp/mode/hardware.pm
index 6484309766..e63e121440 100644
--- a/src/network/juniper/common/screenos/snmp/mode/hardware.pm
+++ b/src/network/juniper/common/screenos/snmp/mode/hardware.pm
@@ -34,7 +34,8 @@ sub set_system {
     
     $self->{thresholds} = {
         fan => [
-            ['active', 'OK'],
+            ['Good', 'OK'],
+            ['Not installed', 'OK'],
             ['.*', 'CRITICAL'],
         ],
         module => [