diff --git a/magisk/service.sh b/magisk/service.sh
index 40d2d20..15f1311 100755
--- a/magisk/service.sh
+++ b/magisk/service.sh
@@ -34,16 +34,21 @@ fi
         sleep 1
     done
 
-    # avoid breaking Realme fingerprint scanners
+    # Avoid breaking Realme fingerprint scanners
     resetprop ro.boot.flash.locked 1
 
-    # avoid breaking Oppo fingerprint scanners
+    # Avoid breaking Oppo fingerprint scanners
     resetprop ro.boot.vbmeta.device_state locked
 
-    # avoid breaking OnePlus display modes/fingerprint scanners
+    # Avoid breaking OnePlus display modes/fingerprint scanners
     resetprop vendor.boot.verifiedbootstate green
 
-    # avoid breaking encryption, set shipping level to 32 for devices >=33 to allow for software attestation.
+    # Safetynet (avoid breaking OnePlus display modes/fingerprint scanners on OOS 12)
+    resetprop ro.boot.verifiedbootstate green
+    resetprop ro.boot.veritymode enforcing
+    resetprop vendor.boot.vbmeta.device_state locked
+
+    # Avoid breaking encryption, set shipping level to 32 for devices >=33 to allow for software attestation
     if [[ "$(getprop ro.product.first_api_level)" -ge 33 ]]; then
         resetprop ro.product.first_api_level 32
     fi
diff --git a/magisk/system.prop b/magisk/system.prop
index 42af17b..a1dfa57 100644
--- a/magisk/system.prop
+++ b/magisk/system.prop
@@ -1,5 +1,3 @@
-# Basic MagiskHide properties
-
 # RootBeer, Microsoft
 ro.build.tags=release-keys
 
@@ -12,11 +10,6 @@ ro.warranty_bit=0
 # OnePlus
 ro.is_ever_orange=0
 
-# SafetyNet
-ro.boot.verifiedbootstate=green
-ro.boot.veritymode=enforcing
-vendor.boot.vbmeta.device_state=locked
-
 # Other
 ro.build.type=user
 ro.debuggable=0