diff --git a/module/post-fs-data.sh b/module/post-fs-data.sh
index eb84c4c..7eaa466 100644
--- a/module/post-fs-data.sh
+++ b/module/post-fs-data.sh
@@ -53,3 +53,11 @@ if [ -n "$(resetprop persist.sys.pixelprops.pi)" ]; then
     resetprop -n -p persist.sys.pixelprops.gapps false
     resetprop -n -p persist.sys.pixelprops.gms false
 fi
+
+# LeafOS "gmscompat: Dynamically spoof props for GMS"
+# https://review.leafos.org/c/LeafOS-Project/android_frameworks_base/+/4416
+# https://review.leafos.org/c/LeafOS-Project/android_frameworks_base/+/4417/5
+if [ -f /data/system/gms_certified_props.json ] && [ ! "$(resetprop persist.sys.spoof.gms)" = "false" ]; then
+	resetprop persist.sys.spoof.gms false
+fi
+
diff --git a/module/uninstall.sh b/module/uninstall.sh
new file mode 100644
index 0000000..d248079
--- /dev/null
+++ b/module/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# LeafOS "gmscompat: Dynamically spoof props for GMS"
+# https://review.leafos.org/c/LeafOS-Project/android_frameworks_base/+/4416
+# https://review.leafos.org/c/LeafOS-Project/android_frameworks_base/+/4417/5
+if [ -f /data/system/gms_certified_props.json ]; then
+	resetprop -p --delete persist.sys.spoof.gms
+fi
+
+# EOF