diff --git a/lib/app.dart b/lib/app.dart
index 51f9d61427..7775825328 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -8,7 +8,6 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart'
     hide Consumer, FutureProvider, Provider;
-import 'package:overlay_support/overlay_support.dart';
 import 'package:provider/provider.dart';
 
 import 'account/account_key_value.dart';
@@ -16,7 +15,6 @@ import 'account/notification_service.dart';
 import 'constants/brightness_theme_data.dart';
 import 'constants/resources.dart';
 import 'generated/l10n.dart';
-
 import 'ui/home/bloc/conversation_list_bloc.dart';
 import 'ui/home/conversation/conversation_page.dart';
 import 'ui/home/home.dart';
@@ -61,11 +59,7 @@ class App extends HookConsumerWidget {
     } else {
       child = _LoginApp(authState: authState);
     }
-
-    return FocusHelper(
-        child: Directionality(
-            textDirection: TextDirection.ltr,
-            child: OverlaySupport.local(child: child)));
+    return FocusHelper(child: child);
   }
 }
 
@@ -262,7 +256,7 @@ class _Home extends HookConsumerWidget {
         ..limit = MediaQuery.sizeOf(context).height ~/
             (ConversationPage.conversationItemHeight / 1.75)
         ..init();
-      return const HomePage();
+      return const PortalProviders(child: HomePage());
     }
     return const LandingPage();
   }
diff --git a/lib/ui/home/chat/voice_recorder_bottom_bar.dart b/lib/ui/home/chat/voice_recorder_bottom_bar.dart
index 9f08a9f829..75bea77b98 100644
--- a/lib/ui/home/chat/voice_recorder_bottom_bar.dart
+++ b/lib/ui/home/chat/voice_recorder_bottom_bar.dart
@@ -17,7 +17,6 @@ import '../../../utils/load_balancer_utils.dart';
 import '../../../utils/logger.dart';
 import '../../../utils/system/audio_session.dart';
 import '../../../widgets/action_button.dart';
-import '../../../widgets/brightness_observer.dart';
 import '../../../widgets/dialog.dart';
 import '../../../widgets/toast.dart';
 import '../../../widgets/waveform_widget.dart';
@@ -192,15 +191,13 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
       converter: (state) => state.state != RecorderState.idle,
     );
     final link = useMemoized(LayerLink.new);
-    final overlay = Overlay.of(context, rootOverlay: true);
+
+    final overlay = Navigator.of(context).overlay ?? Overlay.of(context);
 
     final recorderBottomBarEntry = useRef<OverlayEntry?>(null);
 
     final voiceRecorderCubit = context.read<VoiceRecorderCubit>();
 
-    final value = BrightnessData.of(context);
-    final theme = BrightnessData.themeOf(context);
-
     useEffect(
       () {
         recorderBottomBarEntry.value?.remove();
@@ -215,20 +212,16 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
                 value: voiceRecorderCubit,
               ),
             ],
-            child: BrightnessData(
-              value: value,
-              brightnessThemeData: theme,
-              child: _RecordingInterceptor(
-                child: UnconstrainedBox(
-                  child: CompositedTransformFollower(
-                    link: link,
-                    showWhenUnlinked: false,
-                    targetAnchor: Alignment.center,
-                    followerAnchor: Alignment.center,
-                    child: SizedBox(
-                      width: layoutWidth,
-                      child: const Material(child: VoiceRecorderBottomBar()),
-                    ),
+            child: _RecordingInterceptor(
+              child: UnconstrainedBox(
+                child: CompositedTransformFollower(
+                  link: link,
+                  showWhenUnlinked: false,
+                  targetAnchor: Alignment.center,
+                  followerAnchor: Alignment.center,
+                  child: SizedBox(
+                    width: layoutWidth,
+                    child: const Material(child: VoiceRecorderBottomBar()),
                   ),
                 ),
               ),