diff --git a/libs/customer-payment/src/injection-tokens/public_api.ts b/libs/customer-payment/src/injection-tokens/public_api.ts
deleted file mode 100644
index 0cdef1f657..0000000000
--- a/libs/customer-payment/src/injection-tokens/public_api.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER } from './error-matcher.token';
diff --git a/libs/customer-payment/src/public_api.ts b/libs/customer-payment/src/public_api.ts
index be8edb266f..15a170da9d 100644
--- a/libs/customer-payment/src/public_api.ts
+++ b/libs/customer-payment/src/public_api.ts
@@ -1,2 +1 @@
 export * from './models/public_api';
-export * from './injection-tokens/public_api';
diff --git a/libs/customer-payment/state/src/effects/payment.effects.ts b/libs/customer-payment/state/src/effects/payment.effects.ts
index 200165257d..efdc178ae0 100644
--- a/libs/customer-payment/state/src/effects/payment.effects.ts
+++ b/libs/customer-payment/state/src/effects/payment.effects.ts
@@ -16,10 +16,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffCustomerPayment,
-  DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER,
-} from '@daffodil/customer-payment';
+import { DaffCustomerPayment } from '@daffodil/customer-payment';
 import {
   DaffCustomerPaymentDriver,
   DaffCustomerPaymentDriverInterface,
@@ -44,6 +41,7 @@ import {
   DaffCustomerPaymentListSuccess,
   DaffCustomerPaymentActions,
 } from '../actions/payment.actions';
+import { DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCustomerPaymentEffects<
diff --git a/libs/customer-payment/src/injection-tokens/error-matcher.token.ts b/libs/customer-payment/state/src/injection-tokens/error-matcher.token.ts
similarity index 100%
rename from libs/customer-payment/src/injection-tokens/error-matcher.token.ts
rename to libs/customer-payment/state/src/injection-tokens/error-matcher.token.ts
diff --git a/libs/customer-payment/state/src/injection-tokens/public_api.ts b/libs/customer-payment/state/src/injection-tokens/public_api.ts
index dc9a1ac9c3..009a410397 100644
--- a/libs/customer-payment/state/src/injection-tokens/public_api.ts
+++ b/libs/customer-payment/state/src/injection-tokens/public_api.ts
@@ -3,3 +3,4 @@ export {
   daffPaymentProvideAvailableProcessors,
 } from './available-transforms.token';
 export { DAFF_CUSTOMER_PAYMENT_REQUEST_TRANSFORM_COLLECTION } from './transform-collection.token';
+export { DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER } from './error-matcher.token';
diff --git a/libs/customer-payment/state/src/public_api.ts b/libs/customer-payment/state/src/public_api.ts
index 8748df79e3..56eca4b91f 100644
--- a/libs/customer-payment/state/src/public_api.ts
+++ b/libs/customer-payment/state/src/public_api.ts
@@ -3,5 +3,6 @@ export * from './reducers/public_api';
 export * from './selectors/public_api';
 export * from './facades/public_api';
 export * from './models/public_api';
+export * from './injection-tokens/public_api';
 
 export * from './state.module';