diff --git a/lib/logic/cubit/devices/devices_cubit.dart b/lib/logic/cubit/devices/devices_cubit.dart
index 5e5c145c..d76e3651 100644
--- a/lib/logic/cubit/devices/devices_cubit.dart
+++ b/lib/logic/cubit/devices/devices_cubit.dart
@@ -15,9 +15,9 @@ class ApiDevicesCubit
 
   @override
   void load() async {
-    if (serverInstallationCubit.state is ServerInstallationFinished) {
-      _refetch();
-    }
+    // if (serverInstallationCubit.state is ServerInstallationFinished) {
+    _refetch();
+    // }
   }
 
   Future<void> refresh() async {
diff --git a/lib/logic/cubit/recovery_key/recovery_key_cubit.dart b/lib/logic/cubit/recovery_key/recovery_key_cubit.dart
index 56800be3..5ca2bfa9 100644
--- a/lib/logic/cubit/recovery_key/recovery_key_cubit.dart
+++ b/lib/logic/cubit/recovery_key/recovery_key_cubit.dart
@@ -14,21 +14,21 @@ class RecoveryKeyCubit
 
   @override
   void load() async {
-    if (serverInstallationCubit.state is ServerInstallationFinished) {
-      final RecoveryKeyStatus? status = await _getRecoveryKeyStatus();
-      if (status == null) {
-        emit(state.copyWith(loadingStatus: LoadingStatus.error));
-      } else {
-        emit(
-          state.copyWith(
-            status: status,
-            loadingStatus: LoadingStatus.success,
-          ),
-        );
-      }
+    // if (serverInstallationCubit.state is ServerInstallationFinished) {
+    final RecoveryKeyStatus? status = await _getRecoveryKeyStatus();
+    if (status == null) {
+      emit(state.copyWith(loadingStatus: LoadingStatus.error));
     } else {
-      emit(state.copyWith(loadingStatus: LoadingStatus.uninitialized));
+      emit(
+        state.copyWith(
+          status: status,
+          loadingStatus: LoadingStatus.success,
+        ),
+      );
     }
+    // } else {
+    //   emit(state.copyWith(loadingStatus: LoadingStatus.uninitialized));
+    // }
   }
 
   Future<RecoveryKeyStatus?> _getRecoveryKeyStatus() async {