diff --git a/docs/app-dev/app-architecture.md b/docs/app-dev/app-architecture.md
index 074f4ad13..d98e279dc 100644
--- a/docs/app-dev/app-architecture.md
+++ b/docs/app-dev/app-architecture.md
@@ -56,6 +56,6 @@ Tendermint.
 See the following for more extensive documentation:
 
 - [Interchain Standard for the Light-Client REST API](https://github.com/cosmos/cosmos-sdk/pull/1028)
-- [Tendermint RPC Docs](https://tendermint.com/rpc/)
+- [Tendermint RPC Docs](https://docs.tendermint.com/master/rpc/)
 - [Tendermint in Production](../tendermint-core/running-in-production.md)
 - [ABCI spec](https://github.com/tendermint/spec/tree/95cf253b6df623066ff7cd4074a94e7a3f147c7a/spec/abci)
diff --git a/docs/app-dev/indexing-transactions.md b/docs/app-dev/indexing-transactions.md
index b3a4789b0..4afca5775 100644
--- a/docs/app-dev/indexing-transactions.md
+++ b/docs/app-dev/indexing-transactions.md
@@ -106,7 +106,7 @@ You can query the transaction results by calling `/tx_search` RPC endpoint:
 curl "localhost:26657/tx_search?query=\"account.name='igor'\"&prove=true"
 ```
 
-Check out [API docs](https://tendermint.com/rpc/#txsearch) for more information
+Check out [API docs](https://docs.tendermint.com/master/rpc/#/Info/tx_search) for more information
 on query syntax and other options.
 
 ## Subscribing to Transactions
@@ -125,5 +125,5 @@ a query to `/subscribe` RPC endpoint.
 }
 ```
 
-Check out [API docs](https://tendermint.com/rpc/#subscribe) for more information
+Check out [API docs](https://docs.tendermint.com/master/rpc/#subscribe) for more information
 on query syntax and other options.
diff --git a/docs/app-dev/subscribing-to-events-via-websocket.md b/docs/app-dev/subscribing-to-events-via-websocket.md
index afedc1d59..5f5cc8921 100644
--- a/docs/app-dev/subscribing-to-events-via-websocket.md
+++ b/docs/app-dev/subscribing-to-events-via-websocket.md
@@ -24,7 +24,7 @@ method via Websocket.
 }
 ```
 
-Check out [API docs](https://tendermint.com/rpc/) for
+Check out [API docs](https://docs.tendermint.com/master/rpc/) for
 more information on query syntax and other options.
 
 You can also use tags, given you had included them into DeliverTx
diff --git a/docs/tendermint-core/running-in-production.md b/docs/tendermint-core/running-in-production.md
index 1df370893..7a436ec95 100644
--- a/docs/tendermint-core/running-in-production.md
+++ b/docs/tendermint-core/running-in-production.md
@@ -99,7 +99,7 @@ send & receive rate per connection (`SendRate`, `RecvRate`).
 ### RPC
 
 Endpoints returning multiple entries are limited by default to return 30
-elements (100 max). See the [RPC Documentation](https://tendermint.com/rpc/)
+elements (100 max). See the [RPC Documentation](https://docs.tendermint.com/master/rpc/)
 for more information.
 
 Rate-limiting and authentication are another key aspects to help protect
diff --git a/docs/tendermint-core/using-tendermint.md b/docs/tendermint-core/using-tendermint.md
index 46b6cc1b5..2c6370e84 100644
--- a/docs/tendermint-core/using-tendermint.md
+++ b/docs/tendermint-core/using-tendermint.md
@@ -160,7 +160,7 @@ endpoints. Some take no arguments (like `/status`), while others specify
 the argument name and use `_` as a placeholder.
 
 ::: tip
-Find the RPC Documentation [here](https://tendermint.com/rpc/)
+Find the RPC Documentation [here](https://docs.tendermint.com/master/rpc/)
 :::
 
 ### Formatting
diff --git a/rpc/core/consensus.go b/rpc/core/consensus.go
index d88a6ba6a..a2a619ea5 100644
--- a/rpc/core/consensus.go
+++ b/rpc/core/consensus.go
@@ -79,7 +79,7 @@ func DumpConsensusState(ctx *rpctypes.Context) (*ctypes.ResultDumpConsensusState
 
 // ConsensusState returns a concise summary of the consensus state.
 // UNSTABLE
-// More: https://tendermint.com/rpc/#/Info/consensus_state
+// More: https://docs.tendermint.com/master/rpc/#/Info/consensus_state
 func ConsensusState(ctx *rpctypes.Context) (*ctypes.ResultConsensusState, error) {
 	// Get self round state.
 	bz, err := consensusState.GetRoundStateSimpleJSON()