diff --git a/CHANGELOG.md b/CHANGELOG.md
index 007c6783..4df11a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 - @cosmjs/cosmwasm-stargate: Add `fromBinary`/`toBinary` to convert between
   JavaScript objects and the JSON representation of `cosmwasm_std::Binary`
   (base64).
+- @cosmjs/cosmwasm-stargate: Export `WasmExtension` and `setupWasmExtension`.
 
 ### Changed
 
diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
index 9ad71383..2960852d 100644
--- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
@@ -30,11 +30,6 @@ import { ContractCodeHistoryOperationType } from "cosmjs-types/cosmwasm/wasm/v1/
 
 import { JsonObject, setupWasmExtension, WasmExtension } from "./queries";
 
-// Re-exports that belong to public CosmWasmClient interfaces
-export {
-  JsonObject, // returned by CosmWasmClient.queryContractSmart
-};
-
 export interface Code {
   readonly id: number;
   /** Bech32 account address */
diff --git a/packages/cosmwasm-stargate/src/index.ts b/packages/cosmwasm-stargate/src/index.ts
index efb91837..ec6c4d82 100644
--- a/packages/cosmwasm-stargate/src/index.ts
+++ b/packages/cosmwasm-stargate/src/index.ts
@@ -1,12 +1,5 @@
 export { cosmWasmTypes } from "./aminotypes";
-export {
-  Code,
-  CodeDetails,
-  Contract,
-  ContractCodeHistoryEntry,
-  CosmWasmClient,
-  JsonObject,
-} from "./cosmwasmclient";
+export { Code, CodeDetails, Contract, ContractCodeHistoryEntry, CosmWasmClient } from "./cosmwasmclient";
 export {
   isMsgClearAdminEncodeObject,
   isMsgExecuteEncodeObject,
@@ -22,6 +15,7 @@ export {
   MsgUpdateAdminEncodeObject,
 } from "./encodeobjects";
 export { fromBinary, toBinary } from "./encoding";
+export { JsonObject, setupWasmExtension, WasmExtension } from "./queries";
 export {
   ChangeAdminResult,
   ExecuteResult,