diff --git a/src/entities/Font/model/store/fontsByIdsStore/fontsByIdsStore.svelte.ts b/src/entities/Font/model/store/fontsByIdsStore/fontsByIdsStore.svelte.ts
index a2cb585..4c83b83 100644
--- a/src/entities/Font/model/store/fontsByIdsStore/fontsByIdsStore.svelte.ts
+++ b/src/entities/Font/model/store/fontsByIdsStore/fontsByIdsStore.svelte.ts
@@ -1,5 +1,5 @@
 import { fontKeys } from '$shared/api/queryKeys';
-import { BaseQueryStore } from '$shared/lib';
+import { BaseQueryStore } from '$shared/lib/helpers/BaseQueryStore/BaseQueryStore.svelte';
 import {
     fetchFontsByIds,
     seedFontCache,
diff --git a/src/shared/lib/helpers/index.ts b/src/shared/lib/helpers/index.ts
index 3c3f723..bba4aa4 100644
--- a/src/shared/lib/helpers/index.ts
+++ b/src/shared/lib/helpers/index.ts
@@ -137,7 +137,8 @@ export {
     type PerspectiveManager,
 } from './createPerspectiveManager/createPerspectiveManager.svelte';
 
-/**
- * Base Query store using Tanstack query
+/*
+ * BaseQueryStore is intentionally NOT re-exported here.
+ * It pulls @tanstack/query-core, so routing it through this leaf barrel would
+ * make every consumer of the barrel eager-load TanStack. Import it by path.
  */
-export { BaseQueryStore } from './BaseQueryStore/BaseQueryStore.svelte';
diff --git a/src/shared/lib/index.ts b/src/shared/lib/index.ts
index 75b6dcc..0e52af8 100644
--- a/src/shared/lib/index.ts
+++ b/src/shared/lib/index.ts
@@ -5,7 +5,6 @@
  */
 
 export {
-    BaseQueryStore,
     createDebouncedState,
     createEntityStore,
     createFilter,