diff --git a/resources/defaults.py b/resources/defaults.py
index cb0f37a65..1cdb06c50 100644
--- a/resources/defaults.py
+++ b/resources/defaults.py
@@ -204,6 +204,7 @@ class GenerateDefaults:
         self.constants.sip_status = False
         self.constants.secure_status = False
         self.constants.disable_cs_lv = True
+        self.constants.disable_amfi = True
 
         if is_legacy_wifi is True:
             # 13.0: Enabling AirPlay to Mac patches breaks Control Center on legacy chipsets
diff --git a/resources/sys_patch/sys_patch_detect.py b/resources/sys_patch/sys_patch_detect.py
index 48c60f691..aba656489 100644
--- a/resources/sys_patch/sys_patch_detect.py
+++ b/resources/sys_patch/sys_patch_detect.py
@@ -561,13 +561,15 @@ class DetectRootPatch:
                 if self.constants.detected_os >= os_data.os_data.ventura:
                     # Due to extracted frameworks for IO80211.framework and co, check library validation
                     self.amfi_must_disable = True
+                    if self.constants.detected_os > os_data.os_data.ventura:
+                        self.amfi_shim_bins = True
 
         if (
             isinstance(self.constants.computer.wifi, device_probe.Broadcom)
             and self.constants.computer.wifi.chipset in [device_probe.Broadcom.Chipsets.AirPortBrcm4360, device_probe.Broadcom.Chipsets.AirportBrcmNIC]):
             if self.constants.detected_os > os_data.os_data.ventura:
                 self.modern_wifi = True
-                self.amfi_must_disable = True
+                self.amfi_shim_bins = True
 
         # if self.model in ["MacBookPro5,1", "MacBookPro5,2", "MacBookPro5,3", "MacBookPro8,2", "MacBookPro8,3"]:
         if self.model in ["MacBookPro8,2", "MacBookPro8,3"]: