diff --git a/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts b/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
index 603470946..1514553c2 100644
--- a/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
+++ b/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
@@ -1,6 +1,6 @@
 import type { CheckoutEndpoint } from '.'
+import { Orders } from '@commercelayer/sdk'
 import getCredentials from '../../utils/getCredentials'
-import Order from '@commercelayer/sdk'
 
 const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   req,
@@ -18,7 +18,7 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
 
   const { ENDPOINT } = getCredentials()
   if (orderId && accessToken) {
-    const clOrder = await Order.withCredentials({ ENDPOINT, accessToken })
+    const clOrder = await Orders.withCredentials({ ENDPOINT, accessToken })
       .includes('lineItems')
       .find(orderId as string, { rawResponse: true })
     const checkoutUrl = clOrder.data.attributes.checkout_url
diff --git a/packages/commercelayer/src/api/utils/getCredentials.ts b/packages/commercelayer/src/api/utils/getCredentials.ts
index 80624083d..109a16f76 100644
--- a/packages/commercelayer/src/api/utils/getCredentials.ts
+++ b/packages/commercelayer/src/api/utils/getCredentials.ts
@@ -16,10 +16,10 @@ export function getOrganizationSlug<E extends string>(endpoint: E): ReturnObj {
     organization: '',
     domain: 'commercelayer.io',
   }
-  if (endpoint) {
-    if (endpoint.search('commercelayer.io') === -1)
+  if (ENDPOINT) {
+    if (ENDPOINT.search('commercelayer.io') === -1)
       org.domain = 'commercelayer.co'
-    org.organization = endpoint
+    org.organization = ENDPOINT
       .replace('https://', '')
       .replace(`.${org.domain}`, '')
   }