diff --git a/module/customize.sh b/module/customize.sh
index 00c20a4..1f5b5dd 100644
--- a/module/customize.sh
+++ b/module/customize.sh
@@ -3,11 +3,14 @@ if [ "$API" -lt 26 ]; then
     abort "!!! You can't use this module on Android < 8.0"
 fi
 
-# Remove safetynet-fix module if installed
+# Remove/warn if conflicting modules are installed
 if [ -d /data/adb/modules/safetynet-fix ]; then
     touch /data/adb/modules/safetynet-fix/remove
     ui_print "- 'safetynet-fix' module will be removed on next reboot"
 fi
+if [ -d /data/adb/modules/MagiskHidePropsConf ]; then
+    ui_print "- Warning, 'MagiskHidePropsConf' module may cause issues with PIF"
+fi
 
 # Clean up any leftover files from previous deprecated methods
 rm -f /data/data/com.google.android.gms/cache/pif.prop /data/data/com.google.android.gms/pif.prop
diff --git a/module/post-fs-data.sh b/module/post-fs-data.sh
index 42a4ccf..20cf1b6 100644
--- a/module/post-fs-data.sh
+++ b/module/post-fs-data.sh
@@ -3,10 +3,12 @@ if magisk --denylist status; then
     magisk --denylist rm com.google.android.gms
 fi
 
-# Remove safetynet-fix module if installed
-if [ -d /data/adb/modules/safetynet-fix ]; then
-    touch /data/adb/modules/safetynet-fix/remove
-fi
+# Remove conflicting modules if installed
+for i in MagiskHidePropsConf safetynet-fix; do
+    if [ -d /data/adb/modules/$i ]; then
+        touch /data/adb/modules/$i/remove
+    fi
+done
 
 # Conditional early sensitive properties