diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart
index a12cc52d..79c354f5 100644
--- a/lib/views/widgets/equipment/single_device_picker.dart
+++ b/lib/views/widgets/equipment/single_device_picker.dart
@@ -30,7 +30,6 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
   UserProvider? _userProvider;
   SettingProvider? _settingProvider;
   final List<Device> _searchableList = [];
-  bool _firstTime = true;
   Subtitle? _subtitle;
 
   _getDevice(String? result) async {
@@ -58,6 +57,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
 
   @override
   void dispose() {
+    _devicesProvider?.reset();
     super.dispose();
   }
 
@@ -76,11 +76,9 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
         isFailedLoading: _devicesProvider?.devices == null,
         onRefresh: () async {
           _devicesProvider?.reset();
+          _searchableList.clear();
           await _devicesProvider?.getEquipment(user: _userProvider?.user ?? User(), host: _settingProvider?.host ?? "", hospitalId: _userProvider?.user?.hospital?.id ?? "");
-          if (_firstTime) {
             _searchableList.addAll(_devicesProvider?.devices ?? []);
-            _firstTime = false;
-          }
         },
         child: Column(
           children: [
diff --git a/lib/views/widgets/loaders/loading_manager.dart b/lib/views/widgets/loaders/loading_manager.dart
index 567304e7..67c1c01f 100644
--- a/lib/views/widgets/loaders/loading_manager.dart
+++ b/lib/views/widgets/loaders/loading_manager.dart
@@ -35,6 +35,7 @@ class LoadingManager extends StatefulWidget {
 class _LoadingManagerState extends State<LoadingManager> {
   @override
   void initState() {
+    print(widget.stateCode);
     if (widget.onRefresh != null && widget.stateCode == null) {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
         widget.onRefresh!();
@@ -58,7 +59,7 @@ class _LoadingManagerState extends State<LoadingManager> {
     // return loading widget
     if (widget.isLoading != false || widget.stateCode == null) {
       placeHolder = const ALoading();
-    } else if ((widget.isFailedLoading ?? false) && !(widget.isNotPage ?? false)) {
+    } else if ((widget.isFailedLoading ?? false) && !(widget.isNotPage)) {
       // if failed return failed widget
       placeHolder = FailedLoading(
         message: HttpStatusManger.getStatusMessage(status: widget.stateCode, subtitle: subtitle),