diff --git a/packages/medusa/src/services/__mocks__/payment-provider.js b/packages/medusa/src/services/__mocks__/payment-provider.js
index 94110e27c1..e9dd8334ce 100644
--- a/packages/medusa/src/services/__mocks__/payment-provider.js
+++ b/packages/medusa/src/services/__mocks__/payment-provider.js
@@ -17,7 +17,7 @@ export const PaymentProviderServiceMock = {
     if (providerId === "default_provider") {
       return DefaultProviderMock
     }
-    return undefined
+    throw new Error("Provider Not Found")
   }),
 }
 
diff --git a/packages/medusa/src/services/__tests__/cart.js b/packages/medusa/src/services/__tests__/cart.js
index 7d897f6b47..496cd81cc8 100644
--- a/packages/medusa/src/services/__tests__/cart.js
+++ b/packages/medusa/src/services/__tests__/cart.js
@@ -695,9 +695,7 @@ describe("CartService", () => {
           PaymentProviderServiceMock.retrieveProvider
         ).toHaveBeenCalledWith("unregistered")
 
-        expect(err.message).toEqual(
-          `The payment provider for the payment method was not found`
-        )
+        expect(err.message).toEqual(`Provider Not Found`)
       }
     })
 
diff --git a/packages/medusa/src/services/__tests__/payment-provider.js b/packages/medusa/src/services/__tests__/payment-provider.js
new file mode 100644
index 0000000000..e1fb0a6bac
--- /dev/null
+++ b/packages/medusa/src/services/__tests__/payment-provider.js
@@ -0,0 +1,29 @@
+import { createContainer, asValue } from "awilix"
+import PaymentProviderService from "../payment-provider"
+
+describe("ProductService", () => {
+  describe("retrieveProvider", () => {
+    const container = createContainer()
+
+    container.register({
+      pp_default_provider: asValue("good"),
+    })
+
+    const providerService = new PaymentProviderService(container)
+
+    it("successfully retrieves payment provider", () => {
+      const provider = providerService.retrieveProvider("default_provider")
+      expect(provider).toEqual("good")
+    })
+
+    it("fails when payment provider not found", () => {
+      try {
+        providerService.retrieveProvider("unregistered")
+      } catch (err) {
+        expect(err.message).toEqual(
+          "Could not find a payment provider with id: unregistered"
+        )
+      }
+    })
+  })
+})
diff --git a/packages/medusa/src/services/cart.js b/packages/medusa/src/services/cart.js
index 777460ab6a..c78f0387b4 100644
--- a/packages/medusa/src/services/cart.js
+++ b/packages/medusa/src/services/cart.js
@@ -432,12 +432,6 @@ class CartService extends BaseService {
     const provider = this.paymentProviderService_.retrieveProvider(
       paymentMethod.provider_id
     )
-    if (!provider) {
-      throw new MedusaError(
-        MedusaError.Types.NOT_FOUND,
-        `The payment provider for the payment method was not found`
-      )
-    }
 
     const status = await provider.getStatus(paymentMethod.data)
     if (status !== "authorized") {