diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b63cf3b66..af1b608ba7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
     <application
         android:name=".BitwardenApplication"
         android:allowBackup="false"
-        android:appComponentFactory=".BitwardenAppComponentFactory"
+        android:appComponentFactory="com.x8bit.bitwarden.BitwardenAppComponentFactory"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
index b1b5358f2d..6ffad2d01f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
@@ -1,8 +1,8 @@
 package com.x8bit.bitwarden
 
-import android.app.AppComponentFactory
 import android.app.Service
 import android.content.Intent
+import androidx.core.app.AppComponentFactory
 import com.x8bit.bitwarden.data.autofill.BitwardenAutofillService
 import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
 
@@ -20,7 +20,7 @@ class BitwardenAppComponentFactory : AppComponentFactory() {
      * service is created. This is required because the [className] used in the manifest must match
      * the legacy Xamarin app service name but the service name in this app is different.
      */
-    override fun instantiateService(
+    override fun instantiateServiceCompat(
         cl: ClassLoader,
         className: String,
         intent: Intent?,