diff --git a/packages/amino/src/signdoc.ts b/packages/amino/src/signdoc.ts
index ba319b4a..fe5f1fb7 100644
--- a/packages/amino/src/signdoc.ts
+++ b/packages/amino/src/signdoc.ts
@@ -62,7 +62,7 @@ export function makeSignDoc(
   memo: string | undefined,
   accountNumber: number | string,
   sequence: number | string,
-  timeout_height?: string,
+  timeout_height?: bigint,
 ): StdSignDoc {
   return {
     chain_id: chainId,
@@ -71,7 +71,7 @@ export function makeSignDoc(
     fee: fee,
     msgs: msgs,
     memo: memo || "",
-    ...(timeout_height && { timeout_height }),
+    ...(timeout_height && { timeout_height: timeout_height.toString() }),
   };
 }
 
diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
index 1f50c162..64e5a113 100644
--- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
+++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
@@ -1214,14 +1214,7 @@ describe("SigningCosmWasmClient", () => {
         };
         const memo = "Use your power wisely";
         const height = await client.getHeight();
-        const signed = await client.sign(
-          alice.address0,
-          [msgAny],
-          fee,
-          memo,
-          undefined,
-          Long.fromNumber(height + 1),
-        );
+        const signed = await client.sign(alice.address0, [msgAny], fee, memo, undefined, BigInt(height + 3));
 
         // ensure signature is valid
         const result = await client.broadcastTx(Uint8Array.from(TxRaw.encode(signed).finish()));
@@ -1468,14 +1461,7 @@ describe("SigningCosmWasmClient", () => {
         };
         const memo = "Use your tokens wisely";
         const height = await client.getHeight();
-        const signed = await client.sign(
-          alice.address0,
-          [msgAny],
-          fee,
-          memo,
-          undefined,
-          Long.fromNumber(height + 1),
-        );
+        const signed = await client.sign(alice.address0, [msgAny], fee, memo, undefined, BigInt(height + 3));
 
         // ensure signature is valid
         const result = await client.broadcastTx(Uint8Array.from(TxRaw.encode(signed).finish()));
diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
index 9627cf9d..626a1b6a 100644
--- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
@@ -643,7 +643,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     fee: StdFee,
     memo: string,
     explicitSignerData?: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     let signerData: SignerData;
     if (explicitSignerData) {
@@ -669,7 +669,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     fee: StdFee,
     memo: string,
     { accountNumber, sequence, chainId }: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     assert(!isOfflineDirectSigner(this.signer));
     const accountFromSigner = (await this.signer.getAccounts()).find(
@@ -681,15 +681,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     const pubkey = encodePubkey(encodeSecp256k1Pubkey(accountFromSigner.pubkey));
     const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
     const msgs = messages.map((msg) => this.aminoTypes.toAmino(msg));
-    const signDoc = makeSignDocAmino(
-      msgs,
-      fee,
-      chainId,
-      memo,
-      accountNumber,
-      sequence,
-      timeoutHeight?.toString(),
-    );
+    const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence, timeoutHeight);
     const { signature, signed } = await this.signer.signAmino(signerAddress, signDoc);
     const signedTxBody: TxBodyEncodeObject = {
       typeUrl: "/cosmos.tx.v1beta1.TxBody",
@@ -723,7 +715,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     fee: StdFee,
     memo: string,
     { accountNumber, sequence, chainId }: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     assert(isOfflineDirectSigner(this.signer));
     const accountFromSigner = (await this.signer.getAccounts()).find(
diff --git a/packages/stargate/src/signingstargateclient.spec.ts b/packages/stargate/src/signingstargateclient.spec.ts
index 6da21f6d..22e709b0 100644
--- a/packages/stargate/src/signingstargateclient.spec.ts
+++ b/packages/stargate/src/signingstargateclient.spec.ts
@@ -936,14 +936,7 @@ describe("SigningStargateClient", () => {
         };
         const memo = "Use your power wisely";
         const height = await client.getHeight();
-        const signed = await client.sign(
-          faucet.address0,
-          [msgAny],
-          fee,
-          memo,
-          undefined,
-          Long.fromNumber(height + 1),
-        );
+        const signed = await client.sign(faucet.address0, [msgAny], fee, memo, undefined, BigInt(height + 3));
 
         // ensure signature is valid
         const result = await client.broadcastTx(Uint8Array.from(TxRaw.encode(signed).finish()));
@@ -1184,14 +1177,7 @@ describe("SigningStargateClient", () => {
         };
         const memo = "Use your tokens wisely";
         const height = await client.getHeight();
-        const signed = await client.sign(
-          faucet.address0,
-          [msgAny],
-          fee,
-          memo,
-          undefined,
-          Long.fromNumber(height + 1),
-        );
+        const signed = await client.sign(faucet.address0, [msgAny], fee, memo, undefined, BigInt(height + 3));
 
         // ensure signature is valid
         const result = await client.broadcastTx(Uint8Array.from(TxRaw.encode(signed).finish()));
diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts
index a9d91758..f2e94818 100644
--- a/packages/stargate/src/signingstargateclient.ts
+++ b/packages/stargate/src/signingstargateclient.ts
@@ -371,7 +371,7 @@ export class SigningStargateClient extends StargateClient {
     fee: StdFee,
     memo: string,
     explicitSignerData?: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     let signerData: SignerData;
     if (explicitSignerData) {
@@ -397,7 +397,7 @@ export class SigningStargateClient extends StargateClient {
     fee: StdFee,
     memo: string,
     { accountNumber, sequence, chainId }: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     assert(!isOfflineDirectSigner(this.signer));
     const accountFromSigner = (await this.signer.getAccounts()).find(
@@ -409,15 +409,7 @@ export class SigningStargateClient extends StargateClient {
     const pubkey = encodePubkey(encodeSecp256k1Pubkey(accountFromSigner.pubkey));
     const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
     const msgs = messages.map((msg) => this.aminoTypes.toAmino(msg));
-    const signDoc = makeSignDocAmino(
-      msgs,
-      fee,
-      chainId,
-      memo,
-      accountNumber,
-      sequence,
-      timeoutHeight?.toString(),
-    );
+    const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence, timeoutHeight);
     const { signature, signed } = await this.signer.signAmino(signerAddress, signDoc);
     const signedTxBody = {
       messages: signed.msgs.map((msg) => this.aminoTypes.fromAmino(msg)),
@@ -452,7 +444,7 @@ export class SigningStargateClient extends StargateClient {
     fee: StdFee,
     memo: string,
     { accountNumber, sequence, chainId }: SignerData,
-    timeoutHeight?: Long,
+    timeoutHeight?: bigint,
   ): Promise<TxRaw> {
     assert(isOfflineDirectSigner(this.signer));
     const accountFromSigner = (await this.signer.getAccounts()).find(