diff --git a/lib/core/providers/app_providers.dart b/lib/core/providers/app_providers.dart
index ebe9aef..7879ac2 100644
--- a/lib/core/providers/app_providers.dart
+++ b/lib/core/providers/app_providers.dart
@@ -703,12 +703,8 @@ final defaultModelAutoSelectionProvider = Provider<void>((ref) {
 });
 
 // Cache timestamp for conversations to prevent rapid re-fetches
-final _conversationsCacheTimestamp =
-    NotifierProvider<_ConversationsCacheTimestampNotifier, DateTime?>(
-      _ConversationsCacheTimestampNotifier.new,
-    );
-
-class _ConversationsCacheTimestampNotifier extends Notifier<DateTime?> {
+@riverpod
+class _ConversationsCacheTimestamp extends _$ConversationsCacheTimestamp {
   @override
   DateTime? build() => null;
 
diff --git a/lib/shared/widgets/offline_indicator.dart b/lib/shared/widgets/offline_indicator.dart
index 14d8037..ea247a8 100644
--- a/lib/shared/widgets/offline_indicator.dart
+++ b/lib/shared/widgets/offline_indicator.dart
@@ -1,13 +1,18 @@
+import 'dart:io' show Platform;
+
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:flutter_animate/flutter_animate.dart';
-import 'dart:io' show Platform;
+
 import '../../core/services/connectivity_service.dart';
 import '../../core/providers/app_providers.dart';
 import '../theme/theme_extensions.dart';
 import 'package:conduit/l10n/app_localizations.dart';
 
+part 'offline_indicator.g.dart';
+
 class OfflineIndicator extends ConsumerWidget {
   final Widget child;
   final bool showBanner;
@@ -52,11 +57,8 @@ class OfflineIndicator extends ConsumerWidget {
 }
 
 // Tracks if the app was recently offline to enable a one-shot back-online toast
-final _wasOfflineProvider = NotifierProvider<_WasOfflineNotifier, bool>(
-  _WasOfflineNotifier.new,
-);
-
-class _WasOfflineNotifier extends Notifier<bool> {
+@riverpod
+class _WasOffline extends _$WasOffline {
   @override
   bool build() {
     // Initialize based on current connectivity (assume online until proven otherwise)