diff --git a/lib/views/pages/user/requests/work_order/work_order_details_page.dart b/lib/views/pages/user/requests/work_order/work_order_details_page.dart
index 6c077aaa..a07c6dd9 100644
--- a/lib/views/pages/user/requests/work_order/work_order_details_page.dart
+++ b/lib/views/pages/user/requests/work_order/work_order_details_page.dart
@@ -49,9 +49,9 @@ class WorkOrderDetailsPage extends StatelessWidget {
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
                                 StatusLabel(
-                                  label: workOrderDetails.currentSituation.name,
-                                  textColor: AppColor.getRequestStatusTextColorByName(context, workOrderDetails.currentSituation.name),
-                                  backgroundColor: AppColor.getRequestStatusColorByName(context, workOrderDetails.currentSituation.name),
+                                  label: workOrderDetails.currentSituation?.name,
+                                  textColor: AppColor.getRequestStatusTextColorByName(context, workOrderDetails.currentSituation?.name),
+                                  backgroundColor: AppColor.getRequestStatusColorByName(context, workOrderDetails.currentSituation?.name),
                                 ),
                                 8.height,
                                 Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
@@ -61,7 +61,7 @@ class WorkOrderDetailsPage extends StatelessWidget {
                                   style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
                                 ),
                                 Text(
-                                  '${context.translation.status}:  ${workOrderDetails.currentSituation.name}',
+                                  '${context.translation.status}:  ${workOrderDetails.currentSituation?.name}',
                                   style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
                                 ),
                                 Text(
diff --git a/lib/views/widgets/requests/request_status.dart b/lib/views/widgets/requests/request_status.dart
index 61d20740..52553270 100644
--- a/lib/views/widgets/requests/request_status.dart
+++ b/lib/views/widgets/requests/request_status.dart
@@ -15,11 +15,11 @@ class StatusLabel extends StatelessWidget {
   Widget build(BuildContext context) {
     if (id == 82) label = context.translation.highPriority;
     if (id == 81) label = context.translation.lowPriority;
-    if (label.toLowerCase() == 'In progress'.toLowerCase()) label = context.translation.inProgress;
-    if (label.toLowerCase() == 'Complete'.toLowerCase()) label = context.translation.completed;
-    if (label.toLowerCase() == 'Open'.toLowerCase()) label = context.translation.open;
-    if (label.toLowerCase() == 'Closed'.toLowerCase()) label = context.translation.closed;
-    if (label.toLowerCase() == 'Waiting for quotation'.toLowerCase()) label = context.translation.waitingForQuotation;
+    if (label?.toLowerCase() == 'In progress'.toLowerCase()) label = context.translation.inProgress;
+    if (label?.toLowerCase() == 'Complete'.toLowerCase()) label = context.translation.completed;
+    if (label?.toLowerCase() == 'Open'.toLowerCase()) label = context.translation.open;
+    if (label?.toLowerCase() == 'Closed'.toLowerCase()) label = context.translation.closed;
+    if (label?.toLowerCase() == 'Waiting for quotation'.toLowerCase()) label = context.translation.waitingForQuotation;
 
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
@@ -29,7 +29,7 @@ class StatusLabel extends StatelessWidget {
           borderRadius: BorderRadius.circular(50),
         ),
       ),
-      child: Text(label, style: AppTextStyles.overline.copyWith(color: textColor)),
+      child: Text(label ?? "", style: AppTextStyles.overline.copyWith(color: textColor)),
     );
   }