diff --git a/contracts/protocol/modules/v1/CustomOracleNAVIssuanceModule.sol b/contracts/protocol/modules/v1/CustomOracleNAVIssuanceModule.sol
index 0d202b333..813dda44e 100644
--- a/contracts/protocol/modules/v1/CustomOracleNAVIssuanceModule.sol
+++ b/contracts/protocol/modules/v1/CustomOracleNAVIssuanceModule.sol
@@ -63,8 +63,8 @@ contract CustomOracleNavIssuanceModule is ModuleBase, ReentrancyGuard {
 
     event SetTokenNAVIssued(
         ISetToken indexed _setToken,
-        address _issuer,
-        address _to,
+        address indexed _issuer,
+        address indexed _to,
         address _reserveAsset,
         address _hookContract,
         uint256 _setTokenQuantity,
@@ -74,8 +74,8 @@ contract CustomOracleNavIssuanceModule is ModuleBase, ReentrancyGuard {
 
     event SetTokenNAVRedeemed(
         ISetToken indexed _setToken,
-        address _redeemer,
-        address _to,
+        address indexed _redeemer,
+        address indexed _to,
         address _reserveAsset,
         address _hookContract,
         uint256 _setTokenQuantity,
diff --git a/deprecated/NAVIssuanceModule.sol b/deprecated/NAVIssuanceModule.sol
index 4950bf56e..8e11d5c9e 100644
--- a/deprecated/NAVIssuanceModule.sol
+++ b/deprecated/NAVIssuanceModule.sol
@@ -63,8 +63,8 @@ contract NavIssuanceModule is ModuleBase, ReentrancyGuard {
 
     event SetTokenNAVIssued(
         ISetToken indexed _setToken,
-        address _issuer,
-        address _to,
+        address indexed _issuer,
+        address indexed _to,
         address _reserveAsset,
         address _hookContract,
         uint256 _setTokenQuantity,
@@ -74,8 +74,8 @@ contract NavIssuanceModule is ModuleBase, ReentrancyGuard {
 
     event SetTokenNAVRedeemed(
         ISetToken indexed _setToken,
-        address _redeemer,
-        address _to,
+        address indexed _redeemer,
+        address indexed _to,
         address _reserveAsset,
         address _hookContract,
         uint256 _setTokenQuantity,