diff --git a/libs/cart/src/injection-tokens/public_api.ts b/libs/cart/src/injection-tokens/public_api.ts
index 0260ebf9cd..0df1495644 100644
--- a/libs/cart/src/injection-tokens/public_api.ts
+++ b/libs/cart/src/injection-tokens/public_api.ts
@@ -1,2 +1 @@
 export { DaffCartPaymentMethodIdMap } from './payment-method-map';
-export { DAFF_CART_ERROR_MATCHER } from './error-matcher.token';
diff --git a/libs/cart/state/src/effects/cart-address.effects.ts b/libs/cart/state/src/effects/cart-address.effects.ts
index b43a85cf1d..f4cd98869f 100644
--- a/libs/cart/state/src/effects/cart-address.effects.ts
+++ b/libs/cart/state/src/effects/cart-address.effects.ts
@@ -21,7 +21,6 @@ import {
   DaffCartAddress,
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartAddressDriver,
@@ -41,6 +40,7 @@ import {
   DaffCartAddressUpdateFailure,
   DaffCartStorageFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartAddressEffects<T extends DaffCartAddress, V extends DaffCart> {
diff --git a/libs/cart/state/src/effects/cart-billing-address.effects.ts b/libs/cart/state/src/effects/cart-billing-address.effects.ts
index 652bb2dac7..69931a567b 100644
--- a/libs/cart/state/src/effects/cart-billing-address.effects.ts
+++ b/libs/cart/state/src/effects/cart-billing-address.effects.ts
@@ -18,7 +18,6 @@ import {
   DaffCartAddress,
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartBillingAddressDriver,
@@ -36,6 +35,7 @@ import {
   DaffCartBillingAddressUpdateSuccess,
   DaffCartBillingAddressUpdateFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartBillingAddressEffects<T extends DaffCartAddress, V extends DaffCart> {
diff --git a/libs/cart/state/src/effects/cart-coupon.effects.ts b/libs/cart/state/src/effects/cart-coupon.effects.ts
index 61ead0be5a..4f39fba4c1 100644
--- a/libs/cart/state/src/effects/cart-coupon.effects.ts
+++ b/libs/cart/state/src/effects/cart-coupon.effects.ts
@@ -21,7 +21,6 @@ import {
   DaffCart,
   DaffCartCoupon,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartCouponDriver,
@@ -50,6 +49,7 @@ import {
   DaffCartCouponApplyFailure,
   DaffCartStorageFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartCouponEffects<
diff --git a/libs/cart/state/src/effects/cart-item.effects.ts b/libs/cart/state/src/effects/cart-item.effects.ts
index 92a5f4f744..d7796eb23e 100644
--- a/libs/cart/state/src/effects/cart-item.effects.ts
+++ b/libs/cart/state/src/effects/cart-item.effects.ts
@@ -29,7 +29,6 @@ import {
   DaffCartItemInput,
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartDriverResolveService,
@@ -63,6 +62,7 @@ import {
   DaffCartItemActions,
 } from '../actions/public_api';
 import { DaffCartItemStateDebounceTime } from '../injection-tokens/cart-item-state-debounce-time';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 import { DaffStatefulCartItem } from '../models/public_api';
 import { getDaffCartSelectors } from '../selectors/public_api';
 
diff --git a/libs/cart/state/src/effects/cart-order.effects.ts b/libs/cart/state/src/effects/cart-order.effects.ts
index cfb3bce3c2..62b2a81020 100644
--- a/libs/cart/state/src/effects/cart-order.effects.ts
+++ b/libs/cart/state/src/effects/cart-order.effects.ts
@@ -22,7 +22,6 @@ import {
   DaffCartPaymentMethod,
   DaffCartOrderResult,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartOrderDriver,
@@ -43,6 +42,7 @@ import {
   DaffCartStorageFailure,
   DaffCartCreate,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartOrderEffects<
diff --git a/libs/cart/state/src/effects/cart-payment-methods.effects.ts b/libs/cart/state/src/effects/cart-payment-methods.effects.ts
index 71f0fbf5ec..0b74c236f6 100644
--- a/libs/cart/state/src/effects/cart-payment-methods.effects.ts
+++ b/libs/cart/state/src/effects/cart-payment-methods.effects.ts
@@ -17,7 +17,6 @@ import {
 import {
   DaffCartPaymentMethod,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartPaymentMethodsDriver,
@@ -32,6 +31,7 @@ import {
   DaffCartPaymentMethodsLoadSuccess,
   DaffCartPaymentMethodsLoadFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartPaymentMethodsEffects<T extends DaffCartPaymentMethod> {
diff --git a/libs/cart/state/src/effects/cart-payment-processor.effects.ts b/libs/cart/state/src/effects/cart-payment-processor.effects.ts
index 5db5508bec..210e031554 100644
--- a/libs/cart/state/src/effects/cart-payment-processor.effects.ts
+++ b/libs/cart/state/src/effects/cart-payment-processor.effects.ts
@@ -23,7 +23,6 @@ import {
   DaffCart,
   DaffCartAddress,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartPaymentDriver,
@@ -46,6 +45,7 @@ import {
   DaffCartPaymentUpdateFailure,
   DaffCartPaymentUpdateSuccess,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartPaymentProcessorEffects<
diff --git a/libs/cart/state/src/effects/cart-payment.effects.ts b/libs/cart/state/src/effects/cart-payment.effects.ts
index 787acaa1f4..148322ecb5 100644
--- a/libs/cart/state/src/effects/cart-payment.effects.ts
+++ b/libs/cart/state/src/effects/cart-payment.effects.ts
@@ -19,7 +19,6 @@ import {
   DaffCart,
   DaffCartAddress,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartPaymentDriver,
@@ -43,6 +42,7 @@ import {
   DaffCartPaymentUpdateWithBillingSuccess,
   DaffCartPaymentUpdateWithBillingFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartPaymentEffects<
diff --git a/libs/cart/state/src/effects/cart-resolver.effects.ts b/libs/cart/state/src/effects/cart-resolver.effects.ts
index 4256077707..0582214b9d 100644
--- a/libs/cart/state/src/effects/cart-resolver.effects.ts
+++ b/libs/cart/state/src/effects/cart-resolver.effects.ts
@@ -27,7 +27,6 @@ import {
 import {
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
   DaffCartServerSideResolutionError,
   DaffCartStorageResolutionError,
   DaffCartResolutionError,
@@ -58,6 +57,7 @@ import {
   DaffResolveCartPartialSuccess,
   DaffCartActions,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 /**
  * An effect for resolving a guest cart for a customer.
diff --git a/libs/cart/state/src/effects/cart-shipping-address.effects.ts b/libs/cart/state/src/effects/cart-shipping-address.effects.ts
index ea728b693c..9038cea885 100644
--- a/libs/cart/state/src/effects/cart-shipping-address.effects.ts
+++ b/libs/cart/state/src/effects/cart-shipping-address.effects.ts
@@ -18,7 +18,6 @@ import {
   DaffCartAddress,
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartShippingAddressDriver,
@@ -36,6 +35,7 @@ import {
   DaffCartShippingAddressUpdateSuccess,
   DaffCartShippingAddressUpdateFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartShippingAddressEffects<T extends DaffCartAddress, V extends DaffCart> {
diff --git a/libs/cart/state/src/effects/cart-shipping-information.effects.ts b/libs/cart/state/src/effects/cart-shipping-information.effects.ts
index 9cc0d9e005..f0994dcbbd 100644
--- a/libs/cart/state/src/effects/cart-shipping-information.effects.ts
+++ b/libs/cart/state/src/effects/cart-shipping-information.effects.ts
@@ -18,7 +18,6 @@ import {
   DaffCartShippingInformation,
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartShippingInformationDriver,
@@ -39,6 +38,7 @@ import {
   DaffCartShippingInformationUpdateSuccess,
   DaffCartShippingInformationUpdateFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartShippingInformationEffects<T extends DaffCartShippingInformation, V extends DaffCart> {
diff --git a/libs/cart/state/src/effects/cart-shipping-methods.effects.ts b/libs/cart/state/src/effects/cart-shipping-methods.effects.ts
index 2e3d873a5f..6871e0f8cb 100644
--- a/libs/cart/state/src/effects/cart-shipping-methods.effects.ts
+++ b/libs/cart/state/src/effects/cart-shipping-methods.effects.ts
@@ -17,7 +17,6 @@ import {
 import {
   DaffCartShippingRate,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartShippingMethodsDriver,
@@ -32,6 +31,7 @@ import {
   DaffCartShippingMethodsLoadSuccess,
   DaffCartShippingMethodsLoadFailure,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartShippingMethodsEffects<T extends DaffCartShippingRate> {
diff --git a/libs/cart/state/src/effects/cart.effects.ts b/libs/cart/state/src/effects/cart.effects.ts
index d9777237ce..7e5b4c27f7 100644
--- a/libs/cart/state/src/effects/cart.effects.ts
+++ b/libs/cart/state/src/effects/cart.effects.ts
@@ -22,7 +22,6 @@ import {
 import {
   DaffCart,
   DaffCartStorageService,
-  DAFF_CART_ERROR_MATCHER,
 } from '@daffodil/cart';
 import {
   DaffCartDriver,
@@ -52,6 +51,7 @@ import {
   DaffCartStorageFailure,
   DaffCartLoadPartialSuccess,
 } from '../actions/public_api';
+import { DAFF_CART_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCartEffects<T extends DaffCart> {
diff --git a/libs/cart/src/injection-tokens/error-matcher.token.ts b/libs/cart/state/src/injection-tokens/error-matcher.token.ts
similarity index 100%
rename from libs/cart/src/injection-tokens/error-matcher.token.ts
rename to libs/cart/state/src/injection-tokens/error-matcher.token.ts
diff --git a/libs/cart/state/src/injection-tokens/public_api.ts b/libs/cart/state/src/injection-tokens/public_api.ts
index 569dcd288b..b4e733417f 100644
--- a/libs/cart/state/src/injection-tokens/public_api.ts
+++ b/libs/cart/state/src/injection-tokens/public_api.ts
@@ -1 +1,2 @@
 export { DaffCartItemStateDebounceTime } from './cart-item-state-debounce-time';
+export { DAFF_CART_ERROR_MATCHER } from './error-matcher.token';