diff --git a/Resources/Build.py b/Resources/Build.py
index 592b6a019..b3c78944e 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -232,7 +232,7 @@ class BuildOpenCore:
         # USB Map
         usb_map_path = Path(self.constants.plist_folder_path) / Path("AppleUSBMaps/Info.plist")
         # 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":
+        if usb_map_path.exists():
             print(f"- Adding USB-Map.kext")
             Path(self.constants.map_kext_folder).mkdir()
             Path(self.constants.map_contents_folder).mkdir()
diff --git a/payloads/Kexts/Plists/AppleUSBMaps/Info.plist b/payloads/Kexts/Plists/AppleUSBMaps/Info.plist
index be66eec56..655d38a50 100644
--- a/payloads/Kexts/Plists/AppleUSBMaps/Info.plist
+++ b/payloads/Kexts/Plists/AppleUSBMaps/Info.plist
@@ -764,7 +764,7 @@
 			<key>model</key>
 			<string>XXerve3,1</string>
 		</dict>
-		<key>iMac7,1</key>
+		<key>#iMac7,1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -3505,7 +3505,7 @@
 			<key>Tunnel Endpoint Device Vendor ID</key>
 			<data>AQAAAA==</data>
 		</dict>
-		<key>iMac7,1-EHC1</key>
+		<key>#iMac7,1-EHC1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -3568,7 +3568,7 @@
 			<key>model</key>
 			<string>iXac7,1</string>
 		</dict>
-		<key>iMac7,1-EHC2</key>
+		<key>#iMac7,1-EHC2</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -5417,7 +5417,7 @@
 			<key>model</key>
 			<string>Xacmini4,1</string>
 		</dict>
-		<key>iMac7,1-OHC1</key>
+		<key>#iMac7,1-OHC1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -5459,7 +5459,7 @@
 			<key>model</key>
 			<string>iXac9,1</string>
 		</dict>
-		<key>iMac7,1-OHC2</key>
+		<key>#iMac7,1-OHC2</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>