diff --git a/packages/create-invoice-form/src/lib/utils/prepareRequest.ts b/packages/create-invoice-form/src/lib/utils/prepareRequest.ts
index 123534cc..c801bb0e 100644
--- a/packages/create-invoice-form/src/lib/utils/prepareRequest.ts
+++ b/packages/create-invoice-form/src/lib/utils/prepareRequest.ts
@@ -1,6 +1,6 @@
+import { parseUnits, zeroAddress, getAddress } from "viem";
 import { Types, Utils } from "@requestnetwork/request-client.js";
 import type { CustomFormData } from "@requestnetwork/shared-types";
-import { parseUnits, zeroAddress } from "viem";
 
 interface IRequestParams {
   currency: any;
@@ -34,11 +34,11 @@ export const prepareRequestParams = ({
       ).toString(),
       payee: {
         type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-        value: formData.creatorId,
+        value: getAddress(formData.creatorId),
       },
       payer: {
         type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-        value: formData.payerAddress,
+        value: getAddress(formData.payerAddress),
       },
       timestamp: Utils.getCurrentTimestampInSecond(),
     },
@@ -49,7 +49,7 @@ export const prepareRequestParams = ({
           : Types.Extension.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT,
       parameters: {
         paymentNetworkName: currency.network,
-        paymentAddress: formData.payeeAddress,
+        paymentAddress: getAddress(formData.payeeAddress),
         feeAddress: zeroAddress,
         feeAmount: "0",
       },
@@ -122,7 +122,7 @@ export const prepareRequestParams = ({
     },
     signer: {
       type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-      value: address as string,
+      value: getAddress(address as string),
     },
   };
 };
diff --git a/packages/invoice-dashboard/src/utils/formatAddress.ts b/packages/invoice-dashboard/src/utils/formatAddress.ts
index 11f796ba..cf55278b 100644
--- a/packages/invoice-dashboard/src/utils/formatAddress.ts
+++ b/packages/invoice-dashboard/src/utils/formatAddress.ts
@@ -1,3 +1,4 @@
+import { getAddress } from "viem";
 import { checkAddress } from "@requestnetwork/shared-utils/checkEthAddress";
 
 export const formatAddress = (
@@ -9,5 +10,7 @@ export const formatAddress = (
     console.error("Invalid address!");
   }
 
-  return `${address.slice(0, first)}...${address.slice(-last)}`;
+  const checksumAddress = getAddress(address);
+
+  return `${checksumAddress.slice(0, first)}...${checksumAddress.slice(-last)}`;
 };