diff --git a/contracts/AcceleratingDistributor.sol b/contracts/AcceleratingDistributor.sol
index bc83504..02e3bee 100644
--- a/contracts/AcceleratingDistributor.sol
+++ b/contracts/AcceleratingDistributor.sol
@@ -156,10 +156,10 @@ contract AcceleratingDistributor is ReentrancyGuard, Ownable, Multicall {
         // payouts could eat into user balances. maxMultiplier is constrained to be at least 1e18 to enforce a minimum
         // 1x multiplier and avoid potential underflows.
         require(stakedToken != address(rewardToken), "Staked token is reward token");
+        require(maxMultiplier <= 1e24, "maxMultiplier too large"); // 1_000_000x multiplier.
         require(maxMultiplier >= 1e18, "maxMultiplier less than 1e18");
-        require(maxMultiplier < 1e36, "maxMultiplier can not be set too large");
-        require(secondsToMaxMultiplier > 0, "secondsToMaxMultiplier must be greater than 0");
-        require(baseEmissionRate < 1e27, "baseEmissionRate can not be set too large");
+        require(secondsToMaxMultiplier > 0, "secondsToMaxMultiplier is 0");
+        require(baseEmissionRate <= 1e24, "baseEmissionRate too large"); // 1 million tokens per second.
 
         StakingToken storage stakingToken = stakingTokens[stakedToken];
 
diff --git a/test/AcceleratingDistributor.Admin.ts b/test/AcceleratingDistributor.Admin.ts
index d54566e..1d230f2 100644
--- a/test/AcceleratingDistributor.Admin.ts
+++ b/test/AcceleratingDistributor.Admin.ts
@@ -120,14 +120,14 @@ describe("AcceleratingDistributor: Admin Functions", async function () {
         lpToken1.address,
         true,
         baseEmissionRate,
-        toWei(toWei(1)),
+        toWei(10000000),
         secondsToMaxMultiplier
       )
-    ).to.be.revertedWith("maxMultiplier can not be set too large");
+    ).to.be.revertedWith("maxMultiplier too large");
 
     await expect(
       distributor.configureStakingToken(lpToken1.address, true, baseEmissionRate, maxMultiplier, 0)
-    ).to.be.revertedWith("secondsToMaxMultiplier must be greater than 0");
+    ).to.be.revertedWith("secondsToMaxMultiplier is 0");
 
     await expect(
       distributor.configureStakingToken(
@@ -137,7 +137,7 @@ describe("AcceleratingDistributor: Admin Functions", async function () {
         maxMultiplier,
         secondsToMaxMultiplier
       )
-    ).to.be.revertedWith("baseEmissionRate can not be set too large");
+    ).to.be.revertedWith("baseEmissionRate too large");
 
     await expect(
       distributor.configureStakingToken(lpToken1.address, true, baseEmissionRate, toWei(1), secondsToMaxMultiplier)