diff --git a/module/common_setup.sh b/module/common_setup.sh
index 73ddc32..f75a8b2 100644
--- a/module/common_setup.sh
+++ b/module/common_setup.sh
@@ -58,3 +58,10 @@ for APP in $(grep -v '^#' $LIST); do
         fi
     fi
 done
+
+# Work around AOSPA PropImitationHooks conflict when their persist props don't exist
+if [ -n "$(resetprop ro.aospa.version)" ]; then
+  for PROP in persist.sys.pihooks.first_api_level persist.sys.pihooks.security_patch; do
+    resetprop | grep -q "\[$PROP\]" || resetprop -n -p "$PROP" "";
+  done;
+fi;