diff --git a/src/controllers/custom/addModularEquipmentController.ts b/src/controllers/custom/addModularEquipmentController.ts
index fbe791d1..f1f6cd17 100644
--- a/src/controllers/custom/addModularEquipmentController.ts
+++ b/src/controllers/custom/addModularEquipmentController.ts
@@ -65,19 +65,21 @@ export const addModularEquipmentController: RequestHandler = async (req, res) =>
         ]
     };
     const defaultWeapons = defaultWeaponsMap[request.ItemType];
-
-    for (const defaultWeapon of defaultWeapons) {
-        const category = ExportWeapons[defaultWeapon].productCategory;
-        requiredFields.add(category);
-        requiredFields.add(productCategoryToInventoryBin(category));
+    if (defaultWeapons) {
+        for (const defaultWeapon of defaultWeapons) {
+            const category = ExportWeapons[defaultWeapon].productCategory;
+            requiredFields.add(category);
+            requiredFields.add(productCategoryToInventoryBin(category));
+        }
     }
 
     const inventory = await getInventory(accountId, Array.from(requiredFields).join(" "));
-
-    for (const defaultWeapon of defaultWeapons) {
-        const category = ExportWeapons[defaultWeapon].productCategory;
-        addEquipment(inventory, category, defaultWeapon);
-        occupySlot(inventory, productCategoryToInventoryBin(category)!, true);
+    if (defaultWeapons) {
+        for (const defaultWeapon of defaultWeapons) {
+            const category = ExportWeapons[defaultWeapon].productCategory;
+            addEquipment(inventory, category, defaultWeapon);
+            occupySlot(inventory, productCategoryToInventoryBin(category)!, true);
+        }
     }
 
     const defaultOverwrites: Partial<IEquipmentDatabase> = {