diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 1051ba9b27..fc37b8b047 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -1035,7 +1035,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
         listOf(
             promptsFeature,
             webAuthnFeature
-        ).any { it.onActivityResult(requestCode, resultCode, data) }
+        ).any { it.onActivityResult(requestCode, data, resultCode) }
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt b/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt
index 5f94163ebe..24576f9321 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt
@@ -12,6 +12,7 @@ import mozilla.components.concept.engine.activity.ActivityDelegate
 import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.base.log.logger.Logger
+import org.mozilla.fenix.FeatureFlags
 
 /**
  * This implementation of the WebAuthnFeature is only for testing in a nightly signed build.
@@ -44,7 +45,7 @@ class WebAuthnFeature(
         engine.unregisterActivityDelegate()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+    override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean {
         logger.info("Received activity result with code: $requestCode\ndata: $data")
         if (this.requestCode == requestCode) {
             logger.info("Invoking callback!")