diff --git a/authpass/android/app/src/main/AndroidManifest.xml b/authpass/android/app/src/main/AndroidManifest.xml
index ce02dcd99..75988e057 100644
--- a/authpass/android/app/src/main/AndroidManifest.xml
+++ b/authpass/android/app/src/main/AndroidManifest.xml
@@ -37,10 +37,14 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
+    <!-- enableOnBackInvokedCallback not working with FlutterFragmentActivity
+    https://github.com/flutter/engine/pull/44865
+    https://github.com/flutter/flutter/issues/109558
+    -->
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:enableOnBackInvokedCallback="true"
+        android:enableOnBackInvokedCallback="false"
         android:fullBackupContent="@xml/backup_descriptor"
         tools:targetApi="tiramisu">
         <activity
diff --git a/authpass/lib/main.dart b/authpass/lib/main.dart
index f72154c96..f43fdd9b0 100644
--- a/authpass/lib/main.dart
+++ b/authpass/lib/main.dart
@@ -417,6 +417,12 @@ class _AuthPassAppState extends State<AuthPassApp> with StreamSubscriberMixin {
           }
           return ret;
         },
+        // onNavigationNotification: (notification) {
+        //   _logger.fine(
+        //       'onNavigationNotification: canHandlePop:${notification.canHandlePop} ()');
+        //   SystemNavigator.setFrameworkHandlesBack(notification.canHandlePop);
+        //   return true;
+        // },
         onGenerateInitialRoutes: (initialRoute) {
           _logger.fine('initialRoute: $initialRoute');
           _deps.analytics.trackScreen(initialRoute);