diff --git a/src/storage/netapp/ontap/restapi/mode/components/fru.pm b/src/storage/netapp/ontap/restapi/mode/components/fru.pm
index 61d8ea458..7bd68ece4 100644
--- a/src/storage/netapp/ontap/restapi/mode/components/fru.pm
+++ b/src/storage/netapp/ontap/restapi/mode/components/fru.pm
@@ -43,9 +43,22 @@ sub check {
         next if ($self->check_filter(section => 'shelf', instance => $shelf_instance));
 
         foreach my $fru (@{$shelf->{frus}}) {
-            my $instance = $fru->{serial_number};
             my $name = $fru->{type} . ':' . $fru->{id};
 
+            if ($fru->{installed} !~ /true|1/i) {
+                $self->{output}->output_add(
+                    long_msg => sprintf(
+                        "fru '%s' shelf '%s' is uninstalled",
+                        $name,
+                        $shelf_name
+                    )
+                );
+                next;
+            }
+
+            my $instance = $fru->{serial_number};
+            
+
             next if ($self->check_filter(section => 'fru', instance => $instance));
             $self->{components}->{fru}->{total}++;
 
diff --git a/src/storage/netapp/ontap/restapi/mode/hardware.pm b/src/storage/netapp/ontap/restapi/mode/hardware.pm
index f8594ac75..a57576114 100644
--- a/src/storage/netapp/ontap/restapi/mode/hardware.pm
+++ b/src/storage/netapp/ontap/restapi/mode/hardware.pm
@@ -96,7 +96,7 @@ Check hardware.
 =item B<--component>
 
 Which component to check (Default: '.*').
-Can be: 'shelf', 'bay', 'fru'.
+Can be: 'bay', 'disk', 'fru', 'shelf'.
 
 =item B<--filter>