diff --git a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
index b8f1ebd4..58ac107d 100644
--- a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
+++ b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
@@ -36,8 +36,10 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
     super.initState();
     _workOrder.copyFrom(widget.subWorkOrder);
     if (checkVendorFieldsVisibility(_workOrder.calllastSituation)) {
-      engineer = _workOrder.suppEngineerWorkOrders?.last;
-      engineer?.id = engineer?.supplierContactId;
+      if (_workOrder.suppEngineerWorkOrders?.isNotEmpty ?? false) {
+        engineer = _workOrder.suppEngineerWorkOrders?.last;
+        engineer?.id = engineer?.supplierContactId;
+      }
       _workOrder.supplier ??= SupplierModel(id: _workOrder?.supplier?.id);
     }
     if (context.mounted) {
@@ -46,7 +48,9 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
   }
 
   bool checkVendorFieldsVisibility(Lookup callsLastSituation) {
-    bool result = (callsLastSituation?.name?.toLowerCase()?.contains("under repair-vendor") ?? false) || (callsLastSituation?.name?.toLowerCase()?.contains("waiting for vendor") ?? false);
+    bool result = (_workOrder.supplier?.suppliername?.isNotEmpty ?? false) ||
+        (callsLastSituation?.name?.toLowerCase()?.contains("under repair-vendor") ?? false) ||
+        (callsLastSituation?.name?.toLowerCase()?.contains("waiting for vendor") ?? false);
     _showVendorFields = result;
     return result;
   }