diff --git a/lib/hooks/configurators/use_disable_battery_optimizations.dart b/lib/hooks/configurators/use_disable_battery_optimizations.dart
index c1155d19..a9afef45 100644
--- a/lib/hooks/configurators/use_disable_battery_optimizations.dart
+++ b/lib/hooks/configurators/use_disable_battery_optimizations.dart
@@ -1,47 +1,21 @@
 import 'package:disable_battery_optimization/disable_battery_optimization.dart';
 import 'package:flutter_desktop_tools/flutter_desktop_tools.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotube/hooks/utils/use_async_effect.dart';
+import 'package:spotube/services/kv_store/kv_store.dart';
 
-bool _asked = false;
 void useDisableBatteryOptimizations() {
   useAsyncEffect(() async {
-    if (!DesktopTools.platform.isAndroid || _asked) return;
-    final localStorage = await SharedPreferences.getInstance();
+    if (!DesktopTools.platform.isAndroid ||
+        KVStoreService.askedForBatteryOptimization) return;
 
-    final rawIsBatteryOptimizationDisabled =
-        localStorage.getBool("isBatteryOptimizationDisabled");
-    final isBatteryOptimizationDisabled =
-        await DisableBatteryOptimization.isBatteryOptimizationDisabled;
-    if (rawIsBatteryOptimizationDisabled != false &&
-        isBatteryOptimizationDisabled == false) {
-      final hasDisabled = await DisableBatteryOptimization
-          .showDisableBatteryOptimizationSettings();
+    await DisableBatteryOptimization.showDisableBatteryOptimizationSettings();
 
-      localStorage.setBool(
-        "isBatteryOptimizationDisabled",
-        hasDisabled == true,
-      );
-    }
+    await DisableBatteryOptimization
+        .showDisableManufacturerBatteryOptimizationSettings(
+      "Your device has additional battery optimization",
+      "Follow the steps and disable the optimizations to allow smooth functioning of this app",
+    );
 
-    final rawIsManBatteryOptimizationDisabled =
-        localStorage.getBool("isManufacturerBatteryOptimizationDisabled");
-    final isManBatteryOptimizationDisabled = await DisableBatteryOptimization
-        .isManufacturerBatteryOptimizationDisabled;
-
-    if (rawIsManBatteryOptimizationDisabled != false &&
-        isManBatteryOptimizationDisabled == false) {
-      final hasDisabled = await DisableBatteryOptimization
-          .showDisableManufacturerBatteryOptimizationSettings(
-        "Your device has additional battery optimization",
-        "Follow the steps and disable the optimizations to allow smooth functioning of this app",
-      );
-
-      localStorage.setBool(
-        "isManufacturerBatteryOptimizationDisabled",
-        hasDisabled == true,
-      );
-    }
-    _asked = true;
+    await KVStoreService.setAskedForBatteryOptimization(true);
   }, null, []);
 }
diff --git a/lib/services/kv_store/kv_store.dart b/lib/services/kv_store/kv_store.dart
index c1275612..5845b120 100644
--- a/lib/services/kv_store/kv_store.dart
+++ b/lib/services/kv_store/kv_store.dart
@@ -12,4 +12,9 @@ abstract class KVStoreService {
       sharedPreferences.getBool('doneGettingStarted') ?? false;
   static Future<void> setDoneGettingStarted(bool value) async =>
       await sharedPreferences.setBool('doneGettingStarted', value);
+
+  static bool get askedForBatteryOptimization =>
+      sharedPreferences.getBool('askedForBatteryOptimization') ?? false;
+  static Future<void> setAskedForBatteryOptimization(bool value) async =>
+      await sharedPreferences.setBool('askedForBatteryOptimization', value);
 }