diff --git a/lib/logic/cubit/devices/devices_cubit.dart b/lib/logic/cubit/devices/devices_cubit.dart
index 5debf20e..7713254b 100644
--- a/lib/logic/cubit/devices/devices_cubit.dart
+++ b/lib/logic/cubit/devices/devices_cubit.dart
@@ -21,7 +21,7 @@ class ApiDevicesCubit
   }
 
   Future<void> refresh() async {
-    emit(const ApiDevicesState([], LoadingStatus.refreshing));
+    emit(ApiDevicesState([state.thisDevice], LoadingStatus.refreshing));
     _refetch();
   }
 
diff --git a/lib/ui/pages/devices/devices.dart b/lib/ui/pages/devices/devices.dart
index 52fffdbe..91fa0d38 100644
--- a/lib/ui/pages/devices/devices.dart
+++ b/lib/ui/pages/devices/devices.dart
@@ -91,6 +91,12 @@ class _DevicesInfo extends StatelessWidget {
                   color: Theme.of(context).colorScheme.secondary,
                 ),
           ),
+          if (devicesStatus.status == LoadingStatus.refreshing) ...[
+            const Center(
+              heightFactor: 4,
+              child: CircularProgressIndicator(),
+            ),
+          ],
           ...devicesStatus.otherDevices
               .map((final device) => _DeviceTile(device: device)),
         ],