diff --git a/nest/src/AggregateToken.sol b/nest/src/AggregateToken.sol
index 0bb4d3a..dd6bcb7 100644
--- a/nest/src/AggregateToken.sol
+++ b/nest/src/AggregateToken.sol
@@ -169,11 +169,12 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
     }
 
     /// @inheritdoc IComponentToken
+    /// @dev Do not add reentrancy guard here, as it is already handled in the parent contract
     function deposit(
         uint256 assets,
         address receiver,
         address controller
-    ) public override(ComponentToken, IComponentToken) nonReentrant returns (uint256 shares) {
+    ) public override(ComponentToken, IComponentToken) returns (uint256 shares) {
         if (_getAggregateTokenStorage().paused) {
             revert DepositPaused();
         }
@@ -182,7 +183,8 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
 
     /**
      * @inheritdoc ERC4626Upgradeable
-     * @dev Overridden to add pause check before deposit
+     * @dev Overridden to add pause check before deposit. Do not add reentrancy guard here, as it is already handled in
+     * the parent contract
      * @param assets Amount of assets to deposit
      * @param receiver Address that will receive the shares
      * @return shares Amount of shares minted
@@ -190,7 +192,7 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
     function deposit(
         uint256 assets,
         address receiver
-    ) public override(ERC4626Upgradeable, IERC4626) nonReentrant returns (uint256 shares) {
+    ) public override(ERC4626Upgradeable, IERC4626) returns (uint256 shares) {
         if (_getAggregateTokenStorage().paused) {
             revert DepositPaused();
         }
@@ -199,7 +201,8 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
 
     /**
      * @inheritdoc ComponentToken
-     * @dev Overridden to add pause check before minting
+     * @dev Overridden to add pause check before minting. Do not add reentrancy guard here, as it is already handled in
+     * the parent contract
      * @param shares Amount of shares to mint
      * @param receiver Address that will receive the shares
      * @param controller Address that controls the minting
@@ -209,7 +212,7 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
         uint256 shares,
         address receiver,
         address controller
-    ) public override(ComponentToken) nonReentrant returns (uint256 assets) {
+    ) public override(ComponentToken) returns (uint256 assets) {
         if (_getAggregateTokenStorage().paused) {
             revert DepositPaused();
         }
@@ -218,7 +221,8 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
 
     /**
      * @inheritdoc ERC4626Upgradeable
-     * @dev Overridden to add pause check before minting
+     * @dev Overridden to add pause check before minting. Do not add reentrancy guard here, as it is already handled in
+     * the parent contract
      * @param shares Amount of shares to mint
      * @param receiver Address that will receive the shares
      * @return assets Amount of assets deposited
@@ -226,7 +230,7 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
     function mint(
         uint256 shares,
         address receiver
-    ) public override(ERC4626Upgradeable, IERC4626) nonReentrant returns (uint256 assets) {
+    ) public override(ERC4626Upgradeable, IERC4626) returns (uint256 assets) {
         if (_getAggregateTokenStorage().paused) {
             revert DepositPaused();
         }
@@ -234,11 +238,12 @@ contract AggregateToken is ComponentToken, IAggregateToken, ERC1155Holder {
     }
 
     /// @inheritdoc IComponentToken
+    /// @dev Do not add reentrancy guard here, as it is already handled in the parent contract
     function redeem(
         uint256 shares,
         address receiver,
         address controller
-    ) public override(ComponentToken, IComponentToken) nonReentrant returns (uint256 assets) {
+    ) public override(ComponentToken, IComponentToken) returns (uint256 assets) {
         return super.redeem(shares, receiver, controller);
     }