diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e7cd9e1..41456f28b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add better kmutil crash handling
 - Fix build crashing when no wifi card is present
 - Allow Legacy Acceleration Patches on Mac Pros and Xserves
+- Fix USB kernel panics on iMac7,1
 
 ## 0.1.0
 - Fix crash on iMacs with Metal GPUs
diff --git a/Resources/Build.py b/Resources/Build.py
index 7e2513765..592b6a019 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -231,7 +231,8 @@ class BuildOpenCore:
 
         # USB Map
         usb_map_path = Path(self.constants.plist_folder_path) / Path("AppleUSBMaps/Info.plist")
-        if usb_map_path.exists():
+        # iMac7,1 kernel panics with USB map installed, remove for time being until properly debugged
+        if usb_map_path.exists() and self.model != "iMac7,1":
             print(f"- Adding USB-Map.kext")
             Path(self.constants.map_kext_folder).mkdir()
             Path(self.constants.map_contents_folder).mkdir()