diff --git a/src/factory/admin/unit/inspection/inspection.ts b/src/factory/admin/unit/inspection/inspection.ts
index ac27226..f77f112 100644
--- a/src/factory/admin/unit/inspection/inspection.ts
+++ b/src/factory/admin/unit/inspection/inspection.ts
@@ -24,19 +24,25 @@ export default abstract class InspectionFactory {
       related = {
         relatedId: record.equipmentId,
         assigned: "equipment",
-        related: EquipmentFactory.mapToSingle(record.equipment),
+        related: record.equipment ? EquipmentFactory.mapToSingle(record.equipment) : undefined,
       };
     } else if (record?.vehicleId) {
       related = {
         relatedId: record.vehicleId,
         assigned: "vehicle",
-        related: VehicleFactory.mapToSingle(record.vehicle),
+        related: record.vehicle ? VehicleFactory.mapToSingle(record.vehicle) : undefined,
       };
-    } else {
+    } else if (record?.wearableId) {
       related = {
         relatedId: record.wearableId,
         assigned: "wearable",
-        related: WearableFactory.mapToSingle(record.wearable),
+        related: record.wearable ? WearableFactory.mapToSingle(record.wearable) : undefined,
+      };
+    } else {
+      related = {
+        relatedId: undefined,
+        assigned: undefined,
+        related: undefined,
       };
     }
     return related;
diff --git a/src/factory/admin/unit/inspection/inspectionPlan.ts b/src/factory/admin/unit/inspection/inspectionPlan.ts
index 6e48ed5..0d6e231 100644
--- a/src/factory/admin/unit/inspection/inspectionPlan.ts
+++ b/src/factory/admin/unit/inspection/inspectionPlan.ts
@@ -22,19 +22,25 @@ export default abstract class InspectionPlanFactory {
       related = {
         relatedId: record.equipmentTypeId,
         assigned: "equipment",
-        related: EquipmentTypeFactory.mapToSingle(record.equipmentType),
+        related: record.equipmentType ? EquipmentTypeFactory.mapToSingle(record.equipmentType) : undefined,
       };
     } else if (record?.vehicleTypeId) {
       related = {
         relatedId: record.vehicleTypeId,
         assigned: "vehicle",
-        related: VehicleTypeFactory.mapToSingle(record.vehicleType),
+        related: record.vehicleType ? VehicleTypeFactory.mapToSingle(record.vehicleType) : undefined,
       };
-    } else {
+    } else if (record?.wearableTypeId) {
       related = {
         relatedId: record.wearableTypeId,
         assigned: "wearable",
-        related: WearableTypeFactory.mapToSingle(record.wearableType),
+        related: record.wearableType ? WearableTypeFactory.mapToSingle(record.wearableType) : undefined,
+      };
+    } else {
+      related = {
+        relatedId: undefined,
+        assigned: undefined,
+        related: undefined,
       };
     }
 
diff --git a/src/factory/admin/unit/maintenance.ts b/src/factory/admin/unit/maintenance.ts
index fb5a464..a831097 100644
--- a/src/factory/admin/unit/maintenance.ts
+++ b/src/factory/admin/unit/maintenance.ts
@@ -17,19 +17,25 @@ export default abstract class MaintenanceFactory {
       assigned = {
         relatedId: record.equipmentId,
         assigned: "equipment",
-        related: EquipmentFactory.mapToSingle(record.equipment),
+        related: record.equipment ? EquipmentFactory.mapToSingle(record.equipment) : undefined,
       };
     } else if (record?.vehicleId) {
       assigned = {
         relatedId: record.vehicleId,
         assigned: "vehicle",
-        related: VehicleFactory.mapToSingle(record.vehicle),
+        related: record.vehicle ? VehicleFactory.mapToSingle(record.vehicle) : undefined,
       };
-    } else {
+    } else if (record?.wearableId) {
       assigned = {
         relatedId: record.wearableId,
         assigned: "wearable",
-        related: WearableFactory.mapToSingle(record.wearable),
+        related: record.wearable ? WearableFactory.mapToSingle(record.wearable) : undefined,
+      };
+    } else {
+      assigned = {
+        relatedId: undefined,
+        assigned: undefined,
+        related: undefined,
       };
     }