diff --git a/integration-tests/api/__tests__/store/__snapshots__/swaps.js.snap b/integration-tests/api/__tests__/store/__snapshots__/swaps.js.snap
index 5605ac2735..654c95ac5e 100644
--- a/integration-tests/api/__tests__/store/__snapshots__/swaps.js.snap
+++ b/integration-tests/api/__tests__/store/__snapshots__/swaps.js.snap
@@ -98,7 +98,7 @@ Object {
       "payment_authorized_at": null,
       "payment_id": null,
       "region_id": "test-region",
-      "shipping_address_id": StringMatching /\\^addr_\\*/,
+      "shipping_address_id": "test-shipping-address",
       "type": "swap",
       "updated_at": Any<String>,
     },
@@ -274,7 +274,7 @@ Object {
       "payment_authorized_at": null,
       "payment_id": null,
       "region_id": "test-region",
-      "shipping_address_id": StringMatching /\\^addr_\\*/,
+      "shipping_address_id": "test-shipping-address",
       "type": "swap",
       "updated_at": Any<String>,
     },
diff --git a/integration-tests/api/__tests__/store/swaps.js b/integration-tests/api/__tests__/store/swaps.js
index 243d5e1e96..1065aef2c6 100644
--- a/integration-tests/api/__tests__/store/swaps.js
+++ b/integration-tests/api/__tests__/store/swaps.js
@@ -1,18 +1,7 @@
 const path = require("path")
 const {
-  Region,
-  Order,
-  Customer,
   ShippingProfile,
-  Product,
-  ProductVariant,
-  MoneyAmount,
-  LineItem,
-  Payment,
-  Cart,
-  ShippingMethod,
   ShippingOption,
-  Swap,
 } = require("@medusajs/medusa")
 
 const setupServer = require("../../../helpers/setup-server")
@@ -137,7 +126,7 @@ describe("/store/carts", () => {
             type: "swap",
             created_at: expect.any(String),
             updated_at: expect.any(String),
-            shipping_address_id: expect.stringMatching(/^addr_*/),
+            shipping_address_id: "test-shipping-address",
             metadata: {
               swap_id: expect.stringMatching(/^swap_*/),
             },
@@ -221,7 +210,7 @@ describe("/store/carts", () => {
           cart: {
             id: expect.stringMatching(/^cart_*/),
             billing_address_id: "test-billing-address",
-            shipping_address_id: expect.stringMatching(/^addr_*/),
+            shipping_address_id: "test-shipping-address",
             type: "swap",
             created_at: expect.any(String),
             updated_at: expect.any(String),
diff --git a/packages/medusa/src/services/__tests__/cart.js b/packages/medusa/src/services/__tests__/cart.js
index 0dd999c58f..92c4455c64 100644
--- a/packages/medusa/src/services/__tests__/cart.js
+++ b/packages/medusa/src/services/__tests__/cart.js
@@ -1,9 +1,11 @@
 import _ from "lodash"
+import { getManager } from "typeorm"
 import { MedusaError } from "medusa-core-utils"
 import { IdMap, MockManager, MockRepository } from "medusa-test-utils"
 import CartService from "../cart"
 import { InventoryServiceMock } from "../__mocks__/inventory"
 import { LineItemAdjustmentServiceMock } from "../__mocks__/line-item-adjustment"
+import { CartRepository } from "../../repositories/cart"
 
 const eventBusService = {
   emit: jest.fn(),
@@ -276,39 +278,6 @@ describe("CartService", () => {
       expect(cartRepository.save).toHaveBeenCalledTimes(1)
     })
 
-    it("successfully creates a cart with a shipping address id but no shippings_address", async () => {
-      await cartService.create({
-        region_id: IdMap.getId("testRegion"),
-        email: "email@test.com",
-        shipping_address_id: "test_shipping_address",
-      })
-
-      expect(eventBusService.emit).toHaveBeenCalledTimes(1)
-      expect(eventBusService.emit).toHaveBeenCalledWith(
-        "cart.created",
-        expect.any(Object)
-      )
-
-      expect(cartRepository.create).toHaveBeenCalledTimes(1)
-      expect(cartRepository.create).toHaveBeenCalledWith(expect.objectContaining({
-        region_id: IdMap.getId("testRegion"),
-        shipping_address: {
-          id: "test_shipping_address",
-          first_name: "LeBron",
-          last_name: "James",
-          address_1: "Dunk St",
-          city: "Dunkville",
-          province: "CA",
-          postal_code: "12345",
-          country_code: "us",
-        },
-        customer_id: IdMap.getId("customer"),
-        email: "email@test.com"
-      }))
-
-      expect(cartRepository.save).toHaveBeenCalledTimes(1)
-    })
-
     it("creates a cart with a prefilled shipping address but a country not part of the region", async () => {
       const res = cartService.create({
         region_id: IdMap.getId("testRegion"),
diff --git a/packages/medusa/src/services/cart.ts b/packages/medusa/src/services/cart.ts
index c2cf84154f..ae1755f6cb 100644
--- a/packages/medusa/src/services/cart.ts
+++ b/packages/medusa/src/services/cart.ts
@@ -37,6 +37,7 @@ import InventoryService from "./inventory"
 import CustomShippingOptionService from "./custom-shipping-option"
 import LineItemAdjustmentService from "./line-item-adjustment"
 import { LineItemRepository } from "../repositories/line-item"
+import { raw } from "express"
 
 type InjectedDependencies = {
   manager: EntityManager
@@ -417,7 +418,7 @@ class CartService extends BaseService {
                 "Shipping country not in region"
               )
             }
-            rawCart.shipping_address = addr
+            rawCart.shipping_address_id = data.shipping_address_id
           }
         }