diff --git a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
index b08d26b..78cdb4a 100644
--- a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
+++ b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
@@ -146,12 +146,14 @@ export default function EquipmentInstancesListPage() {
                           .toLowerCase()
                           .includes(filter.toLowerCase()) ||
                         equipment.remarks
-                          .toLowerCase()
-                          .includes(filter.toLowerCase()) ||
-                        equipment.last_updated
-                          .toLowerCase()
-                          .includes(filter.toLowerCase()) ||
-                        equipment.status.toLowerCase() == filter.toLowerCase()
+                        ? equipment.remarks
+                            .toLowerCase()
+                            .includes(filter.toLowerCase())
+                        : false ||
+                          equipment.last_updated
+                            .toLowerCase()
+                            .includes(filter?.toLowerCase()) ||
+                          equipment.status.toLowerCase() == filter.toLowerCase()
                       : // If filter keyword is null then we just pass through everything as if we did not filter at all
                         true
                   )