diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart
index 4ca3d28b..668128fb 100644
--- a/lib/views/pages/device_transfer/request_device_transfer.dart
+++ b/lib/views/pages/device_transfer/request_device_transfer.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
+import 'package:test_sa/models/hospital.dart';
 
 import '../../../controllers/http_status_manger/http_status_manger.dart';
 import '../../../controllers/localization/localization.dart';
@@ -173,7 +174,7 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
                     ),
                   6.height,
                   HospitalButton(
-                    hospital: _formModel.receiver!.client!,
+                    hospital: _formModel.receiver?.client??Hospital(),
                     onHospitalPick: (hospital) {
                       _formModel.receiver?.client = hospital;
                       setState(() {});
diff --git a/lib/views/pages/device_transfer/track_device_transfer.dart b/lib/views/pages/device_transfer/track_device_transfer.dart
index 8e5c7733..49791085 100644
--- a/lib/views/pages/device_transfer/track_device_transfer.dart
+++ b/lib/views/pages/device_transfer/track_device_transfer.dart
@@ -38,7 +38,7 @@ class _TrackDeviceTransferPageState extends State<TrackDeviceTransferPage>
         child: LoadingManager(
           isLoading: _deviceTransferProvider.isLoading??false,
           isFailedLoading: _deviceTransferProvider.items == null,
-          stateCode: _deviceTransferProvider.stateCode??0,
+          stateCode: _deviceTransferProvider.stateCode,
           onRefresh: () async {
             _deviceTransferProvider.reset();
             await _deviceTransferProvider.getRequests(