diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh
index 8432ab1..f7572ef 100644
--- a/module/common/get_extra.sh
+++ b/module/common/get_extra.sh
@@ -144,7 +144,7 @@ set_security_patch() {
     if [ -n "$formatted_security_patch" ] && [ "$TODAY" -lt "$security_patch_after_1y" ]; then
         TS_version=$(grep "versionCode=" "/data/adb/modules/tricky_store/module.prop" | cut -d'=' -f2)
         # James Clef's TrickyStore fork (GitHub@qwq233/TrickyStore)
-        if grep -q "James" "/data/adb/modules/tricky_store/module.prop"; then
+        if grep -q "James" "/data/adb/modules/tricky_store/module.prop" && ! grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"; then
             SECURITY_PATCH_FILE="/data/adb/tricky_store/devconfig.toml"
             if grep -q "^securityPatch" "$SECURITY_PATCH_FILE"; then
                 sed -i "s/^securityPatch .*/securityPatch = \"$security_patch\"/" "$SECURITY_PATCH_FILE"
@@ -155,8 +155,8 @@ set_security_patch() {
                     sed -i "s/^\[deviceProps\]/securityPatch = \"$security_patch\"\n&/" "$SECURITY_PATCH_FILE"
                 fi
             fi
-        # Official TrickyStore which supports custom security patch
-        elif [ "$TS_version" -ge 158 ]; then
+        # Dakkshesh's fork (GitHub@beakthoven/TrickyStore) or Official TrickyStore which supports custom security patch
+        elif [ "$TS_version" -ge 158 ] || grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"; then
             SECURITY_PATCH_FILE="/data/adb/tricky_store/security_patch.txt"
             printf "system=prop\nboot=%s\nvendor=%s\n" "$security_patch" "$security_patch" > "$SECURITY_PATCH_FILE"
             chmod 644 "$SECURITY_PATCH_FILE"
diff --git a/module/webui/scripts/security_patch.js b/module/webui/scripts/security_patch.js
index 3a953b2..45755e6 100644
--- a/module/webui/scripts/security_patch.js
+++ b/module/webui/scripts/security_patch.js
@@ -235,7 +235,7 @@ function isValid8Digit(value) {
 
 // Initialize event listeners
 export function securityPatch() {
-    exec(`grep -q "James" "/data/adb/modules/tricky_store/module.prop"`)
+    exec(`grep -q "James" "/data/adb/modules/tricky_store/module.prop" && ! grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"`)
         .then(({ errno }) => {
             if (errno === 0) {
                 jamesFork = true;