diff --git a/libs/customer/src/public_api.ts b/libs/customer/src/public_api.ts
index be8edb266f..15a170da9d 100644
--- a/libs/customer/src/public_api.ts
+++ b/libs/customer/src/public_api.ts
@@ -1,2 +1 @@
 export * from './models/public_api';
-export * from './injection-tokens/public_api';
diff --git a/libs/customer/state/src/effects/address.effects.ts b/libs/customer/state/src/effects/address.effects.ts
index 6bfc7f8e51..bc9904393c 100644
--- a/libs/customer/state/src/effects/address.effects.ts
+++ b/libs/customer/state/src/effects/address.effects.ts
@@ -16,10 +16,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffCustomerAddress,
-  DAFF_CUSTOMER_ERROR_MATCHER,
-} from '@daffodil/customer';
+import { DaffCustomerAddress } from '@daffodil/customer';
 import {
   DaffCustomerAddressDriver,
   DaffCustomerAddressDriverInterface,
@@ -43,6 +40,7 @@ import {
   DaffCustomerAddressListFailure,
   DaffCustomerAddressListSuccess,
 } from '../actions/address.actions';
+import { DAFF_CUSTOMER_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCustomerAddressEffects<
diff --git a/libs/customer/state/src/effects/customer.effects.ts b/libs/customer/state/src/effects/customer.effects.ts
index 0f9c96312b..de818ae860 100644
--- a/libs/customer/state/src/effects/customer.effects.ts
+++ b/libs/customer/state/src/effects/customer.effects.ts
@@ -16,10 +16,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffCustomer,
-  DAFF_CUSTOMER_ERROR_MATCHER,
-} from '@daffodil/customer';
+import { DaffCustomer } from '@daffodil/customer';
 import {
   DaffCustomerDriverInterface,
   DaffCustomerDriver,
@@ -40,6 +37,7 @@ import {
   DaffCustomerChangePasswordFailure,
   DaffCustomerChangePasswordSuccess,
 } from '../actions/customer.actions';
+import { DAFF_CUSTOMER_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffCustomerEffects<
diff --git a/libs/customer/src/injection-tokens/error-matcher.token.ts b/libs/customer/state/src/injection-tokens/error-matcher.token.ts
similarity index 100%
rename from libs/customer/src/injection-tokens/error-matcher.token.ts
rename to libs/customer/state/src/injection-tokens/error-matcher.token.ts
diff --git a/libs/customer/src/injection-tokens/public_api.ts b/libs/customer/state/src/injection-tokens/public_api.ts
similarity index 100%
rename from libs/customer/src/injection-tokens/public_api.ts
rename to libs/customer/state/src/injection-tokens/public_api.ts
diff --git a/libs/customer/state/src/public_api.ts b/libs/customer/state/src/public_api.ts
index 59ef17b14b..6940e0cf96 100644
--- a/libs/customer/state/src/public_api.ts
+++ b/libs/customer/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 './customer.module';