diff --git a/tauri-wallet/src/routes/send/SendForm.tsx b/tauri-wallet/src/routes/send/SendForm.tsx
index 9aa9574106..c0f95f7aec 100644
--- a/tauri-wallet/src/routes/send/SendForm.tsx
+++ b/tauri-wallet/src/routes/send/SendForm.tsx
@@ -11,7 +11,7 @@ export const SendForm = ({
   updateRecipAddress: (address: string) => void
   updateAmount: (amount: string) => void
 }) => {
-  const { address } = useContext(ClientContext)
+  const { clientDetails } = useContext(ClientContext)
 
   return (
     <Grid container spacing={3}>
@@ -23,7 +23,7 @@ export const SendForm = ({
           name="sender"
           label="Sender address"
           fullWidth
-          value={address}
+          value={clientDetails?.client_address}
           disabled={true}
         />
       </Grid>
diff --git a/tauri-wallet/src/routes/send/SendReview.tsx b/tauri-wallet/src/routes/send/SendReview.tsx
index 3669d39126..3a6810ca73 100644
--- a/tauri-wallet/src/routes/send/SendReview.tsx
+++ b/tauri-wallet/src/routes/send/SendReview.tsx
@@ -10,7 +10,7 @@ export const SendReview = ({
   recipientAddress: string
   amount: string
 }) => {
-  const { client } = useContext(ClientContext)
+  const { clientDetails } = useContext(ClientContext)
   const theme: Theme = useTheme()
   return (
     <Card
@@ -19,7 +19,10 @@ export const SendReview = ({
     >
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <SendReviewField title="From" subtitle={client.address} />
+          <SendReviewField
+            title="From"
+            subtitle={clientDetails?.client_address!}
+          />
         </Grid>
         <Grid item xs={12}>
           <Divider light />