diff --git a/x/ibc/client/query.go b/x/ibc/client/query.go
index c55d1e287e..961f8fac88 100644
--- a/x/ibc/client/query.go
+++ b/x/ibc/client/query.go
@@ -12,16 +12,32 @@ import (
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 )
 
-// QueryTendermintProof performs an ABCI query with the given key and returns the value
-// of the query, the proto encoded merkle proof for the query and the height
-// at which the proof will succeed on a tendermint verifier (one above the
-// returned IAVL version height).
+// QueryTendermintProof performs an ABCI query with the given key and returns
+// the value of the query, the proto encoded merkle proof, and the height of
+// the Tendermint block containing the state root. The desired tendermint height
+// to perform the query should be set in the client context. The query will be
+// performed at one below this height (at the IAVL version) in order to obtain
+// the correct merkle proof. Proof queries at height less than or equal to 2 are
+// not supported.
 // Issue: https://github.com/cosmos/cosmos-sdk/issues/6567
 func QueryTendermintProof(clientCtx client.Context, key []byte) ([]byte, []byte, clienttypes.Height, error) {
+	height := clientCtx.Height
+
+	// ABCI queries at height less than or equal to 2 are not supported.
+	// Base app does not support queries for height less than or equal to 1.
+	// Therefore, a query at height 2 would be equivalent to a query at height 3
+	if clientCtx.Height <= 2 {
+		return nil, nil, clienttypes.Height{}, fmt.Errorf("proof queries at height <= 2 are not supported")
+	}
+
+	// Use the IAVL height if a valid tendermint height is passed in.
+	height--
+
 	req := abci.RequestQuery{
-		Path:  fmt.Sprintf("store/%s/key", host.StoreKey),
-		Data:  key,
-		Prove: true,
+		Path:   fmt.Sprintf("store/%s/key", host.StoreKey),
+		Height: height,
+		Data:   key,
+		Prove:  true,
 	}
 
 	res, err := clientCtx.QueryABCI(req)