diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50c347b15..a7b4c0276 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
         android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
         android:multiArch="true"
+        tools:remove="android:appComponentFactory"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <activity
diff --git a/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java b/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
index 2807bade9..487b37f5b 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
@@ -150,9 +150,13 @@ public class DynLoad {
 
             // Create the receiver component factory
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && componentFactory != null) {
-                Object factory = cl.loadClass(appInfo.appComponentFactory).newInstance();
                 var delegate = (DelegateComponentFactory) componentFactory;
-                delegate.receiver = (AppComponentFactory) factory;
+                if (appInfo.appComponentFactory == null) {
+                    delegate.receiver = new AppComponentFactory();
+                } else {
+                    Object factory = cl.loadClass(appInfo.appComponentFactory).newInstance();
+                    delegate.receiver = (AppComponentFactory) factory;
+                }
             }
 
             activeClassLoader = cl;