diff --git a/.env.example b/.env.example
index 61673ecd..ba422b12 100644
--- a/.env.example
+++ b/.env.example
@@ -25,7 +25,7 @@ MIDAZ_API_HOST='midaz-onboarding'
 MIDAZ_API_PORT=3000
 MIDAZ_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_API_PORT}/v1'
 MIDAZ_TRANSACTION_BASE_HOST='transaction'
-MIDAZ_TRANSACTION_BASE_PORT=3002
+MIDAZ_TRANSACTION_BASE_PORT=3001
 MIDAZ_TRANSACTION_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_TRANSACTION_BASE_PORT}/v1'
 
 ENABLE_DEBUG=true
diff --git a/.env.local.example b/.env.local.example
index 2b2ec574..8929800a 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -25,5 +25,5 @@ MIDAZ_API_HOST='localhost'
 MIDAZ_API_PORT=3000
 MIDAZ_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_API_PORT}/v1'
 MIDAZ_TRANSACTION_BASE_HOST='localhost'
-MIDAZ_TRANSACTION_BASE_PORT=3002
+MIDAZ_TRANSACTION_BASE_PORT=3001
 MIDAZ_TRANSACTION_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_TRANSACTION_BASE_PORT}/v1'
\ No newline at end of file
diff --git a/src/components/ledger-selector.tsx b/src/components/ledger-selector.tsx
index 5d1ffa22..99b186ce 100644
--- a/src/components/ledger-selector.tsx
+++ b/src/components/ledger-selector.tsx
@@ -50,7 +50,10 @@ const LedgerCommand = ({
   return (
     <Command>
       <CommandInput
-        placeholder="Search ledger..."
+        placeholder={intl.formatMessage({
+          id: 'common.search',
+          defaultMessage: 'Search...'
+        })}
         value={query}
         onValueChange={setQuery}
         className="border-b px-2 py-1 pr-10"
@@ -81,8 +84,7 @@ const LedgerCommand = ({
 export const LedgerSelector = () => {
   const intl = useIntl()
   const [openCommand, setOpenCommand] = React.useState(false)
-  const { currentOrganization, currentLedgerId, setLedgerId } =
-    useOrganization()
+  const { currentOrganization, currentLedger, setLedger } = useOrganization()
   const { data: ledgers } = useListLedgers({
     organizationId: currentOrganization?.id!
   })
@@ -90,14 +92,14 @@ export const LedgerSelector = () => {
   React.useEffect(() => {
     if (
       ledgers?.items?.length &&
-      (!currentLedgerId ||
+      (!currentLedger?.id ||
         !ledgers.items.some(
-          (ledger: ILedgerType) => ledger.id === currentLedgerId
+          (ledger: ILedgerType) => ledger.id === currentLedger.id
         ))
     ) {
-      setLedgerId(ledgers.items[0].id)
+      setLedger(ledgers.items[0])
     }
-  }, [currentOrganization, ledgers, currentLedgerId, setLedgerId])
+  }, [currentOrganization, ledgers, currentLedger?.id, setLedger])
 
   const hasLedgers = !!ledgers?.items?.length
   const totalLedgers = ledgers?.items?.length ?? 0
@@ -125,14 +127,23 @@ export const LedgerSelector = () => {
     )
   }
 
+  const handleSelectChange = (id: string) => {
+    setLedger(ledgers?.items.find((ledger) => ledger.id === id)!)
+  }
+
+  const handleCommandChange = (id: string) => {
+    setLedger(ledgers?.items.find((ledger) => ledger.id === id)!)
+    setOpenCommand(false)
+  }
+
   return (
     <TooltipProvider>
       <Tooltip>
         <TooltipTrigger asChild>
           <div>
             <Select
-              value={currentLedgerId ?? undefined}
-              onValueChange={(newLedgerId) => setLedgerId(newLedgerId)}
+              value={currentLedger?.id ?? undefined}
+              onValueChange={handleSelectChange}
               onOpenChange={(open) => !open && setOpenCommand(false)}
               disabled={!hasLedgers}
             >
@@ -160,11 +171,11 @@ export const LedgerSelector = () => {
                     </SelectLabel>
                     <SelectItem
                       disabled
-                      value={currentLedgerId ?? ''}
+                      value={currentLedger?.id ?? ''}
                       className="font-medium text-zinc-800 data-[disabled]:opacity-100"
                     >
                       {ledgers?.items?.find(
-                        (ledger: any) => ledger.id === currentLedgerId
+                        (ledger: any) => ledger.id === currentLedger?.id
                       )?.name ||
                         intl.formatMessage({
                           id: 'ledger.selector.placeholder',
@@ -195,10 +206,7 @@ export const LedgerSelector = () => {
                         >
                           <LedgerCommand
                             ledgers={ledgers!.items}
-                            onSelect={(id: string) => {
-                              setLedgerId(id)
-                              setOpenCommand(false)
-                            }}
+                            onSelect={handleCommandChange}
                           />
                         </div>
                       )}
diff --git a/src/context/organization-provider/index.tsx b/src/context/organization-provider/index.tsx
index 814d4c73..3f73fef0 100644
--- a/src/context/organization-provider/index.tsx
+++ b/src/context/organization-provider/index.tsx
@@ -31,23 +31,9 @@ export const OrganizationProvider = async ({
   const orgResult = await serverFetcher(
     async () => await fetchAllOrganizationsUseCase.execute(10, 1)
   )
-  const firstOrganization = orgResult?.items?.[0]
-
-  let defaultLedgerId: string | null = null
-  if (firstOrganization?.id) {
-    const ledgersResult = await serverFetcher(
-      async () =>
-        await fetchAllLedgersUseCase.execute(firstOrganization.id, 10, 1)
-    )
-
-    defaultLedgerId = ledgersResult?.items?.[0]?.id ?? null
-  }
 
   return (
-    <OrganizationProviderClient
-      organizations={orgResult?.items ?? []}
-      defaultLedgerId={defaultLedgerId}
-    >
+    <OrganizationProviderClient organizations={orgResult?.items ?? []}>
       {children}
     </OrganizationProviderClient>
   )
diff --git a/src/context/organization-provider/organization-provider-client.tsx b/src/context/organization-provider/organization-provider-client.tsx
index 0ae4dea3..d1fa248f 100644
--- a/src/context/organization-provider/organization-provider-client.tsx
+++ b/src/context/organization-provider/organization-provider-client.tsx
@@ -9,12 +9,16 @@ import {
 } from 'react'
 import { OrganizationEntity } from '@/core/domain/entities/organization-entity'
 import { usePathname, useRouter } from 'next/navigation'
+import { useListLedgers } from '@/client/ledgers'
+import { ILedgerType } from '@/types/ledgers-type'
+import { useDefaultOrg } from './use-default-org'
+import { useDefaultLedger } from './use-default-ledger'
 
 type OrganizationContextProps = {
   currentOrganization: OrganizationEntity
   setOrganization: (organization: OrganizationEntity) => void
-  currentLedgerId: string | null
-  setLedgerId: (ledgerId: string | null) => void
+  currentLedger: ILedgerType
+  setLedger: (ledger: ILedgerType) => void
 }
 
 const OrganizationContext = createContext<OrganizationContextProps>(
@@ -25,12 +29,10 @@ export const useOrganization = () => useContext(OrganizationContext)
 
 export type OrganizationProviderClientProps = PropsWithChildren & {
   organizations: OrganizationEntity[]
-  defaultLedgerId?: string | null
 }
 
 export const OrganizationProviderClient = ({
   organizations: organizationsProp,
-  defaultLedgerId,
   children
 }: OrganizationProviderClientProps) => {
   const router = useRouter()
@@ -42,6 +44,11 @@ export const OrganizationProviderClient = ({
     organizationsProp ?? []
   )
 
+  const [currentLedger, setCurrentLedger] = useState<ILedgerType>(
+    {} as ILedgerType
+  )
+  const { data: ledgers } = useListLedgers({ organizationId: current?.id! })
+
   useEffect(() => {
     // Do nothing if the user is already at the onboarding
     if (pathname.includes('/onboarding')) {
@@ -59,24 +66,26 @@ export const OrganizationProviderClient = ({
     }
   }, [current?.id, organizations.length])
 
-  // Initialize a current organization
-  useEffect(() => {
-    if (organizations.length > 0) {
-      setCurrent(organizations[0])
-    }
-  }, [])
+  useDefaultOrg({
+    organizations,
+    current,
+    setCurrent
+  })
 
-  const [currentLedgerId, setLedgerId] = useState<string | null>(
-    defaultLedgerId ?? null
-  )
+  useDefaultLedger({
+    current,
+    ledgers: ledgers?.items ?? [],
+    currentLedger,
+    setCurrentLedger
+  })
 
   return (
     <OrganizationContext.Provider
       value={{
         currentOrganization: current,
         setOrganization: setCurrent,
-        currentLedgerId,
-        setLedgerId
+        currentLedger: currentLedger,
+        setLedger: setCurrentLedger
       }}
     >
       {children}
diff --git a/src/context/organization-provider/use-default-ledger.ts b/src/context/organization-provider/use-default-ledger.ts
new file mode 100644
index 00000000..1f2b4658
--- /dev/null
+++ b/src/context/organization-provider/use-default-ledger.ts
@@ -0,0 +1,63 @@
+'use client'
+
+import { OrganizationEntity } from '@/core/domain/entities/organization-entity'
+import { getStorageObject } from '@/lib/storage'
+import { ILedgerType } from '@/types/ledgers-type'
+import { useReducer, useEffect } from 'react'
+
+type UseDefaultLedgerProps = {
+  current: OrganizationEntity
+  ledgers: ILedgerType[]
+  currentLedger: ILedgerType
+  setCurrentLedger: (ledger: ILedgerType) => void
+}
+
+const storageKey = 'defaultLedgers'
+
+export function useDefaultLedger({
+  current,
+  ledgers,
+  currentLedger,
+  setCurrentLedger
+}: UseDefaultLedgerProps) {
+  const [defaultLedgers, setDefaultLedgers] = useReducer(
+    (state: Record<string, string>, newState: Record<string, string>) => ({
+      ...state,
+      ...newState
+    }),
+    getStorageObject(storageKey, {})
+  )
+
+  const save = (key: string, value: string) => {
+    localStorage.setItem(
+      storageKey,
+      JSON.stringify({ ...defaultLedgers, [key]: value })
+    )
+    setDefaultLedgers({ [key]: value })
+  }
+
+  useEffect(() => {
+    // Check if is there a organization selected
+    if (current?.id) {
+      // Check if there is a default ledger saved onto local storage
+      const ledger = ledgers?.find(
+        ({ id }) => defaultLedgers[current.id!] === id
+      )
+
+      if (ledger) {
+        // If the ledger is found, set it as the current ledger
+        setCurrentLedger(ledger)
+      } else if (ledgers?.length > 0) {
+        // If the ledger is not found, set the first ledger as the current ledger
+        setCurrentLedger(ledgers?.[0]!)
+      }
+    }
+  }, [current?.id, ledgers?.length])
+
+  useEffect(() => {
+    // Update storage according to the current ledger
+    if (currentLedger?.id) {
+      save(current.id!, currentLedger.id!)
+    }
+  }, [currentLedger?.id])
+}
diff --git a/src/context/organization-provider/use-default-org.ts b/src/context/organization-provider/use-default-org.ts
new file mode 100644
index 00000000..92cf94cd
--- /dev/null
+++ b/src/context/organization-provider/use-default-org.ts
@@ -0,0 +1,56 @@
+'use client'
+
+import { OrganizationEntity } from '@/core/domain/entities/organization-entity'
+import { getStorage } from '@/lib/storage'
+import { useEffect, useState } from 'react'
+
+type UseDefaultOrgProps = {
+  organizations: OrganizationEntity[]
+  current: OrganizationEntity
+  setCurrent: (organization: OrganizationEntity) => void
+}
+
+const storageKey = 'defaultOrg'
+
+export function useDefaultOrg({
+  organizations,
+  current,
+  setCurrent
+}: UseDefaultOrgProps) {
+  const [defaultOrg, setDefaultOrg] = useState<string | null>(
+    getStorage(storageKey, null)
+  )
+
+  const save = (id: string) => {
+    localStorage.setItem(storageKey, id)
+    setDefaultOrg(id)
+  }
+
+  // Initialize a current organization
+  useEffect(() => {
+    // Check if there is a default organization saved onto local storage
+    if (defaultOrg) {
+      // Search for the organization with the id
+      const org = organizations.find(({ id }) => defaultOrg === id)
+
+      // If the organization is found, set it as the current organization
+      if (org) {
+        setCurrent(org)
+        return
+      }
+    }
+
+    // If there is no default organization saved or the organization is not found
+    if (organizations.length > 0) {
+      // Set the first organization as the current one
+      setCurrent(organizations[0])
+    }
+  }, [])
+
+  useEffect(() => {
+    // Update storage according to the current organization
+    if (current?.id) {
+      save(current.id)
+    }
+  }, [current?.id])
+}
diff --git a/src/core/application/use-cases/onboarding/complete-onboarding-use-case.ts b/src/core/application/use-cases/onboarding/complete-onboarding-use-case.ts
index 5b335d16..d19b01bc 100644
--- a/src/core/application/use-cases/onboarding/complete-onboarding-use-case.ts
+++ b/src/core/application/use-cases/onboarding/complete-onboarding-use-case.ts
@@ -34,9 +34,10 @@ export class CompleteOnboardingUseCase implements CompleteOnboarding {
       await this.fetchOrganizationByIdRepository.fetchById(organizationId)
 
     await this.updateOrganizationRepository.updateOrganization(organizationId, {
-      legalName: organization.legalName,
-      doingBusinessAs: organization.doingBusinessAs,
-      metadata: omit(organization.metadata, 'onboarding')
+      metadata: {
+        ...organization.metadata,
+        onboarding: null
+      }
     })
 
     const ledgerEntity: LedgerEntity = LedgerMapper.toDomain(ledger)
diff --git a/src/lib/storage/get-storage-object.ts b/src/lib/storage/get-storage-object.ts
new file mode 100644
index 00000000..008afef6
--- /dev/null
+++ b/src/lib/storage/get-storage-object.ts
@@ -0,0 +1,11 @@
+import { getStorage } from './get-storage'
+
+export function getStorageObject(key: string, defaultValue: any) {
+  try {
+    const dataString = getStorage(key, defaultValue)
+    return JSON.parse(dataString)
+  } catch (error) {
+    console.error(error)
+    return defaultValue
+  }
+}
diff --git a/src/lib/storage/get-storage.ts b/src/lib/storage/get-storage.ts
new file mode 100644
index 00000000..db9ea4be
--- /dev/null
+++ b/src/lib/storage/get-storage.ts
@@ -0,0 +1,15 @@
+const isServer = typeof window === 'undefined'
+
+export function getStorage(key: string, defaultValue: any) {
+  if (isServer) {
+    return defaultValue
+  }
+
+  let value
+  try {
+    value = localStorage.getItem(key) || undefined
+  } catch (e) {
+    // Unsupported
+  }
+  return value || defaultValue
+}
diff --git a/src/lib/storage/index.ts b/src/lib/storage/index.ts
new file mode 100644
index 00000000..686cf8fc
--- /dev/null
+++ b/src/lib/storage/index.ts
@@ -0,0 +1,2 @@
+export * from './get-storage'
+export * from './get-storage-object'