@@ -128,8 +128,9 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
     channel.setMethodCallHandler(null);
     channel = null;
     messenger = null;
-    GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(null, this);
-    GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(null, this);
+    GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(binding.getBinaryMessenger(), null);
+    GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(
+        binding.getBinaryMessenger(), null);
 
     removeEventListeners();
   }