diff --git a/packages/smart-contracts/src/contracts/ERC20EscrowToPay.sol b/packages/smart-contracts/src/contracts/ERC20EscrowToPay.sol
index a961db772..cda270218 100644
--- a/packages/smart-contracts/src/contracts/ERC20EscrowToPay.sol
+++ b/packages/smart-contracts/src/contracts/ERC20EscrowToPay.sol
@@ -151,13 +151,19 @@ contract ERC20EscrowToPay is Ownable {
     revert('not payable receive');
   }
 
+  /**
+   * @notice Sets duration of emergency period, with minimum value of 30 days.
+   */
   function setEmergencyClaimPeriod(uint256 _emergencyClaimPeriod) external onlyOwner {
-    require(_emergencyClaimPeriod >= 30, 'emergency period too short');
+    require(_emergencyClaimPeriod >= 30 days, 'emergency period too short');
     emergencyClaimPeriod = _emergencyClaimPeriod;
   }
 
+  /**
+   * @notice Sets duration of freeze period, with minimum value of 30 days.
+   */
   function setFrozenPeriod(uint256 _frozenPeriod) external onlyOwner {
-    require(_frozenPeriod >= 30, 'frozen period too short');
+    require(_frozenPeriod >= 30 days, 'frozen period too short');
     frozenPeriod = _frozenPeriod;
   }
 
diff --git a/packages/smart-contracts/test/contracts/ERC20EscrowToPay.test.ts b/packages/smart-contracts/test/contracts/ERC20EscrowToPay.test.ts
index 0f3ac5148..4cca90f13 100644
--- a/packages/smart-contracts/test/contracts/ERC20EscrowToPay.test.ts
+++ b/packages/smart-contracts/test/contracts/ERC20EscrowToPay.test.ts
@@ -259,19 +259,33 @@ describe('Contract: ERC20EscrowToPay', () => {
     });
   });
   describe('Admin should be able to change emergency and freeze periods', () => {
-    it('Should be able to change emergency period', async () => {
+    it('Minimum emergency period is 30 days', async () => {
       const twoDaysInSeconds = 3600 * 24 * 2;
-      await erc20EscrowToPay.connect(admin).setEmergencyClaimPeriod(twoDaysInSeconds);
+      expect(
+        erc20EscrowToPay.connect(admin).setEmergencyClaimPeriod(twoDaysInSeconds),
+      ).to.be.revertedWith('emergency period too short');
+    });
+
+    it('Minimum frozen period is 30 days', async () => {
+      const twentyNineDaysInSeconds = 3600 * 24 * 29;
+      expect(
+        erc20EscrowToPay.connect(admin).setFrozenPeriod(twentyNineDaysInSeconds),
+      ).to.be.revertedWith('frozen period too short');
+    });
+
+    it('Should be able to adjust emergency period', async () => {
+      const thirtyOneDaysInSeconds = 3600 * 24 * 31;
+      await erc20EscrowToPay.connect(admin).setEmergencyClaimPeriod(thirtyOneDaysInSeconds);
       const contractEmergencyPeriod = await erc20EscrowToPay.connect(payee).emergencyClaimPeriod();
-      expect(contractEmergencyPeriod).to.be.equal(twoDaysInSeconds);
+      expect(contractEmergencyPeriod).to.be.equal(thirtyOneDaysInSeconds);
     });
-    it('Should be able to adjust freeze period, only admin', async () => {
-      const twoDaysInSeconds = 3600 * 24 * 2;
-      await erc20EscrowToPay.connect(admin).setFrozenPeriod(twoDaysInSeconds);
+    it('Should be able to adjust freeze period', async () => {
+      const thirtyOneDaysInSeconds = 3600 * 24 * 31;
+      await erc20EscrowToPay.connect(admin).setFrozenPeriod(thirtyOneDaysInSeconds);
       const contractFreezePeriod = await erc20EscrowToPay.connect(payee).frozenPeriod();
-      expect(contractFreezePeriod).to.be.equal(twoDaysInSeconds);
+      expect(contractFreezePeriod).to.be.equal(thirtyOneDaysInSeconds);
     });
-    it('Contract creator should not be able to change periods', async () => {
+    it('Contract creator who is not the owner, should not be able to change periods', async () => {
       expect(erc20EscrowToPay.connect(owner).setEmergencyClaimPeriod(100)).to.be.revertedWith(
         'Ownable: caller is not the owner',
       );