diff --git a/.changelog/unreleased/improvements/3318-masp-custom-epoch.md b/.changelog/unreleased/improvements/3318-masp-custom-epoch.md
new file mode 100644
index 0000000000..7b1d0ea050
--- /dev/null
+++ b/.changelog/unreleased/improvements/3318-masp-custom-epoch.md
@@ -0,0 +1,2 @@
+- Added a separate epoch tracker for masp to decouple its logic from the rest of
+  the protocol. ([\#3318](https://github.com/anoma/namada/pull/3318))
\ No newline at end of file