diff --git a/src/features/messages/queries/encoding.ts b/src/features/messages/queries/encoding.ts
index 55ce7b8..6fa9c11 100644
--- a/src/features/messages/queries/encoding.ts
+++ b/src/features/messages/queries/encoding.ts
@@ -4,6 +4,7 @@ import {
   bytesToProtocolAddress,
   ensure0x,
   isAddress,
+  isAddressEvm,
   strip0x,
 } from '@hyperlane-xyz/utils';
 
@@ -19,7 +20,7 @@ export function postgresByteaToString(byteString: string): string {
 }
 
 export function addressToPostgresBytea(address: Address): string {
-  const hexString = addressToByteHexString(address);
+  const hexString = isAddressEvm(address) ? address : addressToByteHexString(address);
   return stringToPostgresBytea(hexString);
 }