diff --git a/packages/medusa-plugin-brightpearl/src/services/brightpearl.js b/packages/medusa-plugin-brightpearl/src/services/brightpearl.js
index 1250a7dc8f..a114000e52 100644
--- a/packages/medusa-plugin-brightpearl/src/services/brightpearl.js
+++ b/packages/medusa-plugin-brightpearl/src/services/brightpearl.js
@@ -1046,9 +1046,7 @@ class BrightpearlService extends BaseService {
         return this.claimService_.createFulfillment(partId, {
           goods_out_note: id,
         })
-      }
-
-      if (partId.startsWith("swap")) {
+      } else {
         return this.swapService_.createFulfillment(partId, {
           goods_out_note: id,
         })
diff --git a/packages/medusa/src/api/routes/admin/orders/index.js b/packages/medusa/src/api/routes/admin/orders/index.js
index 5ffa9237b6..0a22df479b 100644
--- a/packages/medusa/src/api/routes/admin/orders/index.js
+++ b/packages/medusa/src/api/routes/admin/orders/index.js
@@ -191,7 +191,7 @@ export const defaultRelations = [
   "claims.fulfillments",
   "claims.claim_items",
   "claims.claim_items.images",
-  "claims.claim_items.tags",
+  // "claims.claim_items.tags",
   "swaps",
   "swaps.return_order",
   "swaps.payment",