diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
index 7cafdc82..16b0f8b7 100644
--- a/lib/bootstrap.dart
+++ b/lib/bootstrap.dart
@@ -65,7 +65,8 @@ Future<void> lazyBootstrap(
     () => container.read(sharedPreferencesProvider.future),
   );
 
-  final enableAnalytics = container.read(analyticsControllerProvider);
+  final enableAnalytics =
+      await container.read(analyticsControllerProvider.future);
   if (enableAnalytics) {
     await _init(
       "analytics",
diff --git a/lib/core/analytics/analytics_controller.dart b/lib/core/analytics/analytics_controller.dart
index e9157b5c..9c8e6948 100644
--- a/lib/core/analytics/analytics_controller.dart
+++ b/lib/core/analytics/analytics_controller.dart
@@ -19,7 +19,7 @@ bool _testCrashReport = false;
 @Riverpod(keepAlive: true)
 class AnalyticsController extends _$AnalyticsController with AppLogger {
   @override
-  bool build() {
+  Future<bool> build() async {
     return _preferences.getBool(enableAnalyticsPrefKey) ?? true;
   }
 
@@ -27,41 +27,47 @@ class AnalyticsController extends _$AnalyticsController with AppLogger {
       ref.read(sharedPreferencesProvider).requireValue;
 
   Future<void> enableAnalytics() async {
-    loggy.debug("enabling analytics");
-    if (!state) {
-      await _preferences.setBool(enableAnalyticsPrefKey, true);
+    if (state case AsyncData(value: final enabled)) {
+      loggy.debug("enabling analytics");
+      state = const AsyncLoading();
+      if (!enabled) {
+        await _preferences.setBool(enableAnalyticsPrefKey, true);
+      }
+
+      final env = ref.read(environmentProvider);
+      final appInfo = await ref.read(appInfoProvider.future);
+      final dsn = !kDebugMode || _testCrashReport ? Environment.sentryDSN : "";
+      final sentryLogger = SentryLoggyIntegration();
+      LoggerController.instance.addPrinter("analytics", sentryLogger);
+
+      await SentryFlutter.init(
+        (options) {
+          options.dsn = dsn;
+          options.environment = env.name;
+          options.dist = appInfo.release.name;
+          options.debug = kDebugMode;
+          options.enableNativeCrashHandling = true;
+          options.enableNdkScopeSync = true;
+          options.attachThreads = true;
+          options.tracesSampleRate = 0.20;
+          options.enableUserInteractionTracing = true;
+          options.addIntegration(sentryLogger);
+          options.beforeSend = sentryBeforeSend;
+        },
+      );
+
+      state = const AsyncData(true);
     }
-
-    final env = ref.read(environmentProvider);
-    final appInfo = await ref.read(appInfoProvider.future);
-    final dsn = !kDebugMode || _testCrashReport ? Environment.sentryDSN : "";
-    final sentryLogger = SentryLoggyIntegration();
-    LoggerController.instance.addPrinter("analytics", sentryLogger);
-
-    await SentryFlutter.init(
-      (options) {
-        options.dsn = dsn;
-        options.environment = env.name;
-        options.dist = appInfo.release.name;
-        options.debug = kDebugMode;
-        options.enableNativeCrashHandling = true;
-        options.enableNdkScopeSync = true;
-        options.attachThreads = true;
-        options.tracesSampleRate = 0.20;
-        options.enableUserInteractionTracing = true;
-        options.addIntegration(sentryLogger);
-        options.beforeSend = sentryBeforeSend;
-      },
-    );
-
-    state = true;
   }
 
   Future<void> disableAnalytics() async {
-    loggy.debug("disabling analytics");
-    await _preferences.setBool(enableAnalyticsPrefKey, false);
-    await Sentry.close();
-    LoggerController.instance.removePrinter("analytics");
-    state = false;
+    if (state case AsyncData()) {
+      loggy.debug("disabling analytics");
+      state = const AsyncLoading();
+      await _preferences.setBool(enableAnalyticsPrefKey, false);
+      await Sentry.close();
+      LoggerController.instance.removePrinter("analytics");
+      state = const AsyncData(false);
+    }
   }
 }
diff --git a/lib/features/common/general_pref_tiles.dart b/lib/features/common/general_pref_tiles.dart
index bd202c82..8d67c725 100644
--- a/lib/features/common/general_pref_tiles.dart
+++ b/lib/features/common/general_pref_tiles.dart
@@ -104,7 +104,7 @@ class EnableAnalyticsPrefTile extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final t = ref.watch(translationsProvider);
 
-    final autoReport = ref.watch(analyticsControllerProvider);
+    final enabled = ref.watch(analyticsControllerProvider).requireValue;
 
     return SwitchListTile(
       title: Text(t.settings.general.enableAnalytics),
@@ -113,12 +113,12 @@ class EnableAnalyticsPrefTile extends HookConsumerWidget {
         style: Theme.of(context).textTheme.bodySmall,
       ),
       secondary: const Icon(Icons.bug_report),
-      value: autoReport,
+      value: enabled,
       onChanged: (value) async {
         if (onChanged != null) {
           return onChanged!(value);
         }
-        if (autoReport) {
+        if (enabled) {
           await ref
               .read(analyticsControllerProvider.notifier)
               .disableAnalytics();
diff --git a/lib/features/intro/widget/intro_page.dart b/lib/features/intro/widget/intro_page.dart
index e08ba753..4880b3b3 100644
--- a/lib/features/intro/widget/intro_page.dart
+++ b/lib/features/intro/widget/intro_page.dart
@@ -73,7 +73,9 @@ class IntroPage extends HookConsumerWidget with PresLogger {
                       onPressed: () async {
                         if (isStarting.value) return;
                         isStarting.value = true;
-                        if (!ref.read(analyticsControllerProvider)) {
+                        if (!ref
+                            .read(analyticsControllerProvider)
+                            .requireValue) {
                           loggy.info("disabling analytics per user request");
                           try {
                             await ref