diff --git a/module/common_setup.sh b/module/common_setup.sh
index a4a9714..3ddcb14 100644
--- a/module/common_setup.sh
+++ b/module/common_setup.sh
@@ -60,7 +60,7 @@ for APP in $(grep -v '^#' $LIST); do
 done
 
 # Work around custom ROM PropImitationHooks conflict when their persist props don't exist
-if [ -n "$(resetprop ro.aospa.version)" -o -n "$(resetprop net.pixelos.version)" -o -n "$(resetprop ro.afterlife.version)" ]; then
+if [ -n "$(resetprop ro.aospa.version)" -o -n "$(resetprop net.pixelos.version)" -o -n "$(resetprop ro.afterlife.version)" -o -f /data/system/gms_certified_props.json ]; then
     for PROP in persist.sys.pihooks.first_api_level persist.sys.pihooks.security_patch; do
         resetprop | grep -q "\[$PROP\]" || persistprop "$PROP" ""
     done