diff --git a/lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart b/lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart
index d7e7cb17..bc3cb5f3 100644
--- a/lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart
+++ b/lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart
@@ -81,7 +81,9 @@ class _CostCenterFormViewState extends State<CostCenterFormView> {
         await costCenterProvider.getData(id: widget.requestId);
       }
     }
-    setState(() {});
+    if(mounted) {
+      setState(() {});
+    }
   }
 
   void addItem<T>(List<T> list, T Function() creator) {
@@ -190,7 +192,7 @@ class _CostCenterFormViewState extends State<CostCenterFormView> {
           },
         );
       },
-    ).expanded;
+    );
   }
 
   Widget _buildSerialNumberList() {
@@ -225,7 +227,7 @@ class _CostCenterFormViewState extends State<CostCenterFormView> {
           },
         );
       },
-    ).expanded;
+    );
   }
 
   Widget selectionButton() {
diff --git a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
index 8d5f31d8..e2229969 100644
--- a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
+++ b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
@@ -288,7 +288,7 @@ class _DeliveryInspectionFormViewState extends State<DeliveryInspectionFormView>
         ADatePicker(
           label: 'Inspected Date/Time From'.addTranslation,
           hideShadow: true,
-          height: 56.toScreenHeight,
+          // height: 56.toScreenHeight,
           backgroundColor: AppColor.fieldBgColor(context),
           date: model.deliveryInspectionInspectedDateFrom,
           from: DateTime(DateTime.now().year, 1, 1),
@@ -318,7 +318,7 @@ class _DeliveryInspectionFormViewState extends State<DeliveryInspectionFormView>
         ADatePicker(
           label: 'Inspected Date/Time To'.addTranslation,
           hideShadow: true,
-          height: 56.toScreenHeight,
+          // height: 56.toScreenHeight,
           backgroundColor: AppColor.fieldBgColor(context),
           date: model.deliveryInspectionInspectedDateTo,
           from: model.deliveryInspectionInspectedDateFrom,