diff --git a/Keas.Mvc/ClientApp/src/components/Equipment/EquipmentManagedSystemSearchId.tsx b/Keas.Mvc/ClientApp/src/components/Equipment/EquipmentManagedSystemSearchId.tsx
index 2ef9e80f1..e3c81ab3c 100644
--- a/Keas.Mvc/ClientApp/src/components/Equipment/EquipmentManagedSystemSearchId.tsx
+++ b/Keas.Mvc/ClientApp/src/components/Equipment/EquipmentManagedSystemSearchId.tsx
@@ -118,7 +118,7 @@ const EquipmentManagedSystemSearchId = (props: IProps) => {
       // if no error occured except Not Found
       if (isValidSearch) {
         // If listOfComputers' length is not 0 then  display the computers, else display an error message
-        if (listOfComputers.length > 0) {
+        if (!!listOfComputers && listOfComputers.length > 0) {
           return (
             <Table>
               <tbody>