diff --git a/.changelog/unreleased/SDK/2363-masp-storage-optimization.md b/.changelog/unreleased/SDK/2363-masp-storage-optimization.md
new file mode 100644
index 00000000000..fbb467e414c
--- /dev/null
+++ b/.changelog/unreleased/SDK/2363-masp-storage-optimization.md
@@ -0,0 +1,5 @@
+- Modified `ShieldedContext` to use `IndexedTx` to track the last indexed
+  masp tx. Updated `fetch_shielded_transfer` and `compute_pinned_balance`
+  to query the cometBFT rpc endpoints to retrieve masp data.
+  Updated `block_search` to accept a fallible cast to `Height`.
+  ([\#2363](https://github.com/anoma/namada/pull/2363))
\ No newline at end of file
diff --git a/.changelog/unreleased/improvements/2363-masp-storage-optimization.md b/.changelog/unreleased/improvements/2363-masp-storage-optimization.md
new file mode 100644
index 00000000000..6f74c6970eb
--- /dev/null
+++ b/.changelog/unreleased/improvements/2363-masp-storage-optimization.md
@@ -0,0 +1,2 @@
+- Removed masp data from storage. Updated the client to query the cometBFT rpc
+  endpoints. ([\#2363](https://github.com/anoma/namada/pull/2363))
\ No newline at end of file