diff --git a/src-tauri/yaak-models/guest-js/types.ts b/src-tauri/yaak-models/guest-js/types.ts
index 0c1488bc..6f11bad7 100644
--- a/src-tauri/yaak-models/guest-js/types.ts
+++ b/src-tauri/yaak-models/guest-js/types.ts
@@ -1,4 +1,4 @@
-import { createStore } from 'jotai/index';
+import { createStore } from 'jotai';
 import { AnyModel } from '../bindings/gen_models';
 
 export type ExtractModel<T, M> = T extends { model: M } ? T : never;
diff --git a/src-web/components/CommandPaletteDialog.tsx b/src-web/components/CommandPaletteDialog.tsx
index dc579e3a..2f1cf30d 100644
--- a/src-web/components/CommandPaletteDialog.tsx
+++ b/src-web/components/CommandPaletteDialog.tsx
@@ -1,7 +1,7 @@
 import { workspacesAtom } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import { fuzzyFilter } from 'fuzzbunny';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import type { KeyboardEvent, ReactNode } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { createFolder } from '../commands/commands';
diff --git a/src-web/components/DynamicForm.tsx b/src-web/components/DynamicForm.tsx
index 71cc65cc..9011678d 100644
--- a/src-web/components/DynamicForm.tsx
+++ b/src-web/components/DynamicForm.tsx
@@ -11,7 +11,7 @@ import type {
   JsonPrimitive,
 } from '@yaakapp-internal/plugins';
 import classNames from 'classnames';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { useCallback } from 'react';
 import { useActiveRequest } from '../hooks/useActiveRequest';
 import { capitalize } from '../lib/capitalize';
diff --git a/src-web/components/FolderSettingsDialog.tsx b/src-web/components/FolderSettingsDialog.tsx
index ab570f3d..a6b65dfe 100644
--- a/src-web/components/FolderSettingsDialog.tsx
+++ b/src-web/components/FolderSettingsDialog.tsx
@@ -1,5 +1,5 @@
 import { foldersAtom, patchModel } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { Input } from './core/Input';
 import { VStack } from './core/Stacks';
 import { MarkdownEditor } from './MarkdownEditor';
diff --git a/src-web/components/GrpcResponsePane.tsx b/src-web/components/GrpcResponsePane.tsx
index bb629bc9..106e1d03 100644
--- a/src-web/components/GrpcResponsePane.tsx
+++ b/src-web/components/GrpcResponsePane.tsx
@@ -1,8 +1,7 @@
 import type { GrpcEvent, GrpcRequest } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import { format } from 'date-fns';
-import { useAtomValue } from 'jotai';
-import { useSetAtom } from 'jotai/index';
+import { useAtomValue , useSetAtom } from 'jotai';
 import type { CSSProperties } from 'react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useCopy } from '../hooks/useCopy';
diff --git a/src-web/components/Settings/SettingsGeneral.tsx b/src-web/components/Settings/SettingsGeneral.tsx
index 44411d49..ec6b0ebe 100644
--- a/src-web/components/Settings/SettingsGeneral.tsx
+++ b/src-web/components/Settings/SettingsGeneral.tsx
@@ -1,6 +1,6 @@
 import { revealItemInDir } from '@tauri-apps/plugin-opener';
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import React from 'react';
 import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
 import { useAppInfo } from '../../hooks/useAppInfo';
diff --git a/src-web/components/WorkspaceEncryptionSetting.tsx b/src-web/components/WorkspaceEncryptionSetting.tsx
index de6504e1..bdc4ff08 100644
--- a/src-web/components/WorkspaceEncryptionSetting.tsx
+++ b/src-web/components/WorkspaceEncryptionSetting.tsx
@@ -1,7 +1,7 @@
 import { enableEncryption, revealWorkspaceKey, setWorkspaceKey } from '@yaakapp-internal/crypto';
 import type { WorkspaceMeta } from '@yaakapp-internal/models';
 import classNames from 'classnames';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { useEffect, useState } from 'react';
 import { activeWorkspaceAtom, activeWorkspaceMetaAtom } from '../hooks/useActiveWorkspace';
 import { createFastMutation } from '../hooks/useFastMutation';
diff --git a/src-web/components/WorkspaceHeader.tsx b/src-web/components/WorkspaceHeader.tsx
index d3a1d57d..6d8fa3a5 100644
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import React, { memo } from 'react';
 import { activeWorkspaceAtom, activeWorkspaceMetaAtom } from '../hooks/useActiveWorkspace';
 import { useToggleCommandPalette } from '../hooks/useToggleCommandPalette';
diff --git a/src-web/components/WorkspaceSettingsDialog.tsx b/src-web/components/WorkspaceSettingsDialog.tsx
index e32067d6..77d79c00 100644
--- a/src-web/components/WorkspaceSettingsDialog.tsx
+++ b/src-web/components/WorkspaceSettingsDialog.tsx
@@ -1,5 +1,5 @@
 import { patchModel, workspaceMetasAtom, workspacesAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { deleteModelWithConfirm } from '../lib/deleteModelWithConfirm';
 import { router } from '../lib/router';
 import { Banner } from './core/Banner';
diff --git a/src-web/components/sidebar/SidebarItems.tsx b/src-web/components/sidebar/SidebarItems.tsx
index f791c041..3e0d96a2 100644
--- a/src-web/components/sidebar/SidebarItems.tsx
+++ b/src-web/components/sidebar/SidebarItems.tsx
@@ -4,7 +4,7 @@ import {
   websocketConnectionsAtom,
 } from '@yaakapp-internal/models';
 import classNames from 'classnames';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import React, { Fragment, memo } from 'react';
 import { VStack } from '../core/Stacks';
 import { DropMarker } from '../DropMarker';
diff --git a/src-web/hooks/useActiveCookieJar.ts b/src-web/hooks/useActiveCookieJar.ts
index affc203c..e7a0820a 100644
--- a/src-web/hooks/useActiveCookieJar.ts
+++ b/src-web/hooks/useActiveCookieJar.ts
@@ -1,7 +1,7 @@
 import { useSearch } from '@tanstack/react-router';
 import type { CookieJar } from '@yaakapp-internal/models';
 import { cookieJarsAtom } from '@yaakapp-internal/models';
-import { atom, useAtomValue } from 'jotai/index';
+import { atom, useAtomValue } from 'jotai';
 import { useEffect } from 'react';
 import { jotaiStore } from '../lib/jotai';
 import { setWorkspaceSearchParams } from '../lib/setWorkspaceSearchParams';
diff --git a/src-web/hooks/useActiveEnvironment.ts b/src-web/hooks/useActiveEnvironment.ts
index a4a89e86..27dcad55 100644
--- a/src-web/hooks/useActiveEnvironment.ts
+++ b/src-web/hooks/useActiveEnvironment.ts
@@ -1,8 +1,7 @@
 import { useSearch } from '@tanstack/react-router';
 import type { Environment } from '@yaakapp-internal/models';
 import { environmentsAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai';
-import { atom } from 'jotai/index';
+import { useAtomValue , atom } from 'jotai';
 import { useEffect } from 'react';
 import { jotaiStore } from '../lib/jotai';
 
diff --git a/src-web/hooks/useActiveWorkspace.ts b/src-web/hooks/useActiveWorkspace.ts
index 1ce517a9..14aeed43 100644
--- a/src-web/hooks/useActiveWorkspace.ts
+++ b/src-web/hooks/useActiveWorkspace.ts
@@ -1,6 +1,6 @@
 import { useParams } from '@tanstack/react-router';
 import { workspaceMetasAtom, workspacesAtom } from '@yaakapp-internal/models';
-import { atom } from 'jotai/index';
+import { atom } from 'jotai';
 import { useEffect } from 'react';
 import { jotaiStore } from '../lib/jotai';
 
diff --git a/src-web/hooks/useAllRequests.ts b/src-web/hooks/useAllRequests.ts
index d8ce3724..1b417d1b 100644
--- a/src-web/hooks/useAllRequests.ts
+++ b/src-web/hooks/useAllRequests.ts
@@ -3,7 +3,7 @@ import {
   httpRequestsAtom,
   websocketRequestsAtom,
 } from '@yaakapp-internal/models';
-import { atom, useAtomValue } from 'jotai/index';
+import { atom, useAtomValue } from 'jotai';
 
 export const allRequestsAtom = atom(function (get) {
   return [...get(httpRequestsAtom), ...get(grpcRequestsAtom), ...get(websocketRequestsAtom)];
diff --git a/src-web/hooks/useDeleteSendHistory.tsx b/src-web/hooks/useDeleteSendHistory.tsx
index 897d14b6..ee3a6227 100644
--- a/src-web/hooks/useDeleteSendHistory.tsx
+++ b/src-web/hooks/useDeleteSendHistory.tsx
@@ -3,7 +3,7 @@ import {
   httpResponsesAtom,
   websocketConnectionsAtom,
 } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { showAlert } from '../lib/alert';
 import { showConfirmDelete } from '../lib/confirm';
 import { jotaiStore } from '../lib/jotai';
diff --git a/src-web/hooks/useEnvironmentsBreakdown.ts b/src-web/hooks/useEnvironmentsBreakdown.ts
index 3e81b668..a2df647c 100644
--- a/src-web/hooks/useEnvironmentsBreakdown.ts
+++ b/src-web/hooks/useEnvironmentsBreakdown.ts
@@ -1,5 +1,5 @@
 import { environmentsAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { useMemo } from 'react';
 
 export function useEnvironmentsBreakdown() {
diff --git a/src-web/hooks/useHttpAuthentication.ts b/src-web/hooks/useHttpAuthentication.ts
index 2151015a..a616dd1f 100644
--- a/src-web/hooks/useHttpAuthentication.ts
+++ b/src-web/hooks/useHttpAuthentication.ts
@@ -1,7 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import type { GetHttpAuthenticationSummaryResponse } from '@yaakapp-internal/plugins';
-import { useAtomValue } from 'jotai';
-import { atom } from 'jotai/index';
+import { useAtomValue , atom } from 'jotai';
 import { useState } from 'react';
 import { jotaiStore } from '../lib/jotai';
 import { invokeCmd } from '../lib/tauri';
diff --git a/src-web/hooks/useLatestGrpcConnection.ts b/src-web/hooks/useLatestGrpcConnection.ts
index 60998d4c..c484e407 100644
--- a/src-web/hooks/useLatestGrpcConnection.ts
+++ b/src-web/hooks/useLatestGrpcConnection.ts
@@ -1,6 +1,6 @@
 import type { GrpcConnection} from '@yaakapp-internal/models';
 import { grpcConnectionsAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 
 export function useLatestGrpcConnection(requestId: string | null): GrpcConnection | null {
   return useAtomValue(grpcConnectionsAtom).find((c) => c.requestId === requestId) ?? null;
diff --git a/src-web/hooks/useLatestHttpResponse.ts b/src-web/hooks/useLatestHttpResponse.ts
index ed074e0a..7af1b54d 100644
--- a/src-web/hooks/useLatestHttpResponse.ts
+++ b/src-web/hooks/useLatestHttpResponse.ts
@@ -1,6 +1,6 @@
 import type { HttpResponse} from '@yaakapp-internal/models';
 import { httpResponsesAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 
 export function useLatestHttpResponse(requestId: string | null): HttpResponse | null {
   return useAtomValue(httpResponsesAtom).find((r) => r.requestId === requestId) ?? null;
diff --git a/src-web/hooks/usePinnedGrpcConnection.ts b/src-web/hooks/usePinnedGrpcConnection.ts
index bda664aa..af812d5d 100644
--- a/src-web/hooks/usePinnedGrpcConnection.ts
+++ b/src-web/hooks/usePinnedGrpcConnection.ts
@@ -5,8 +5,7 @@ import {
   grpcEventsAtom,
   replaceModelsInStore,
 } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai';
-import { atom } from 'jotai/index';
+import { useAtomValue , atom } from 'jotai';
 import { useEffect } from 'react';
 import { atomWithKVStorage } from '../lib/atoms/atomWithKVStorage';
 import { activeRequestIdAtom } from './useActiveRequestId';
diff --git a/src-web/hooks/usePinnedHttpResponse.ts b/src-web/hooks/usePinnedHttpResponse.ts
index 346b11d9..b6095c96 100644
--- a/src-web/hooks/usePinnedHttpResponse.ts
+++ b/src-web/hooks/usePinnedHttpResponse.ts
@@ -1,6 +1,6 @@
 import type { HttpResponse} from '@yaakapp-internal/models';
 import { httpResponsesAtom } from '@yaakapp-internal/models';
-import { useAtomValue } from 'jotai/index';
+import { useAtomValue } from 'jotai';
 import { useKeyValue } from './useKeyValue';
 import { useLatestHttpResponse } from './useLatestHttpResponse';
 
diff --git a/src-web/hooks/usePinnedWebsocketConnection.ts b/src-web/hooks/usePinnedWebsocketConnection.ts
index a1f56bd9..76a606c8 100644
--- a/src-web/hooks/usePinnedWebsocketConnection.ts
+++ b/src-web/hooks/usePinnedWebsocketConnection.ts
@@ -5,7 +5,7 @@ import {
   websocketConnectionsAtom,
   websocketEventsAtom,
 } from '@yaakapp-internal/models';
-import { atom, useAtomValue } from 'jotai/index';
+import { atom, useAtomValue } from 'jotai';
 import { useEffect } from 'react';
 import { atomWithKVStorage } from '../lib/atoms/atomWithKVStorage';
 import { jotaiStore } from '../lib/jotai';
diff --git a/src-web/hooks/useRequestEditor.tsx b/src-web/hooks/useRequestEditor.tsx
index 718babed..5b70d940 100644
--- a/src-web/hooks/useRequestEditor.tsx
+++ b/src-web/hooks/useRequestEditor.tsx
@@ -1,6 +1,5 @@
 import EventEmitter from 'eventemitter3';
-import { atom } from 'jotai';
-import { useAtom } from 'jotai/index';
+import { atom , useAtom } from 'jotai';
 import type { DependencyList } from 'react';
 import { useCallback, useEffect } from 'react';
 
diff --git a/src-web/hooks/useTemplateFunctions.ts b/src-web/hooks/useTemplateFunctions.ts
index 1cbb1db5..6865e095 100644
--- a/src-web/hooks/useTemplateFunctions.ts
+++ b/src-web/hooks/useTemplateFunctions.ts
@@ -1,7 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import type { GetTemplateFunctionsResponse, TemplateFunction } from '@yaakapp-internal/plugins';
-import { atom, useAtomValue } from 'jotai';
-import { useSetAtom } from 'jotai/index';
+import { atom, useAtomValue , useSetAtom } from 'jotai';
 import { useMemo, useState } from 'react';
 import type { TwigCompletionOption } from '../components/core/Editor/twig/completion';
 import { invokeCmd } from '../lib/tauri';
diff --git a/src-web/lib/atoms/atomWithKVStorage.ts b/src-web/lib/atoms/atomWithKVStorage.ts
index 6b92af3e..a94bf57a 100644
--- a/src-web/lib/atoms/atomWithKVStorage.ts
+++ b/src-web/lib/atoms/atomWithKVStorage.ts
@@ -1,4 +1,4 @@
-import { atom } from 'jotai/index';
+import { atom } from 'jotai';
 import { getKeyValue, setKeyValue } from '../keyValueStore';
 
 export function atomWithKVStorage<T extends object | boolean | number | string | null>(
diff --git a/src-web/lib/dialog.ts b/src-web/lib/dialog.ts
index 8c7e9774..3158b210 100644
--- a/src-web/lib/dialog.ts
+++ b/src-web/lib/dialog.ts
@@ -1,4 +1,4 @@
-import { atom } from 'jotai/index';
+import { atom } from 'jotai';
 import type { DialogInstance } from '../components/Dialogs';
 import { jotaiStore } from './jotai';
 
diff --git a/src-web/lib/jotai.ts b/src-web/lib/jotai.ts
index bb2b6234..cc3298ce 100644
--- a/src-web/lib/jotai.ts
+++ b/src-web/lib/jotai.ts
@@ -1,3 +1,3 @@
-import { createStore } from 'jotai/index';
+import { createStore } from 'jotai';
 
 export const jotaiStore = createStore();
diff --git a/src-web/lib/toast.ts b/src-web/lib/toast.ts
index 458157ab..ea3c4858 100644
--- a/src-web/lib/toast.ts
+++ b/src-web/lib/toast.ts
@@ -1,4 +1,4 @@
-import { atom } from 'jotai/index';
+import { atom } from 'jotai';
 import type { ToastInstance } from '../components/Toasts';
 import { generateId } from './generateId';
 import { jotaiStore } from './jotai';