diff --git a/packages/web/src/core/stores/index.ts b/packages/web/src/core/stores/index.ts
index e0a6f408..f10e6042 100644
--- a/packages/web/src/core/stores/index.ts
+++ b/packages/web/src/core/stores/index.ts
@@ -1,4 +1,22 @@
-export * from "@core/stores/appStore";
-export * from "@core/stores/deviceStore";
-export * from "@core/stores/messageStore";
-export * from "@core/stores/sidebarStore";
+export { useAppStore } from "@core/stores/appStore";
+
+export {
+  type Device,
+  DeviceContext,
+  useDevice,
+  useDeviceStore,
+  type ValidConfigType,
+  type ValidModuleConfigType,
+} from "@core/stores/deviceStore";
+
+export {
+  MessageState,
+  type MessageStore,
+  MessageType,
+  useMessageStore,
+} from "@core/stores/messageStore";
+
+export {
+  SidebarProvider,
+  useSidebar,
+} from "@core/stores/sidebarStore";