diff --git a/.gas-snapshot b/.gas-snapshot
index 41ab1ebc..ad833fbb 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -12,7 +12,7 @@ CallbacksTest:testNestedCallbackResetsCallbackSlot() (gas: 87858)
 CallbacksTest:testPayableCallback() (gas: 76928)
 CallbacksTest:testReentrancyGuardProtectsAgainstDoubleDipping() (gas: 54343)
 CallbacksTest:testRevertsOnCallbackWhenNoActiveCallback() (gas: 72601)
-CallbacksTest:testSimpleCallback() (gas: 284574)
+CallbacksTest:testSimpleCallback() (gas: 284460)
 CallbacksTest:testWithClearedCallback() (gas: 156369)
 CallbacksTest:testWithoutAllowCallback() (gas: 156138)
 CodeJarTest:testCodeJarCanBeWacky() (gas: 114646)
@@ -69,14 +69,14 @@ MulticallTest:testSupplyWETHWithdrawUSDCOnComet() (gas: 247586)
 NoncerTest:testGetActiveNonceNested() (gas: 88525)
 NoncerTest:testGetActiveNonceReplayable() (gas: 65730)
 NoncerTest:testGetActiveNonceSingle() (gas: 44961)
-NoncerTest:testGetActiveReplayCount() (gas: 85439)
-NoncerTest:testGetActiveReplayCountNested() (gas: 89032)
-NoncerTest:testGetActiveReplayCountSingle() (gas: 44824)
-NoncerTest:testGetActiveReplayCountWithNonReplaySoftCancel() (gas: 69406)
+NoncerTest:testGetActiveReplayCount() (gas: 85364)
+NoncerTest:testGetActiveReplayCountNested() (gas: 88957)
+NoncerTest:testGetActiveReplayCountSingle() (gas: 44799)
+NoncerTest:testGetActiveReplayCountWithNonReplaySoftCancel() (gas: 69325)
 NoncerTest:testGetActiveSubmissionTokenNested() (gas: 88031)
 NoncerTest:testGetActiveSubmissionTokenReplayable() (gas: 65756)
 NoncerTest:testGetActiveSubmissionTokenSingle() (gas: 47765)
-NoncerTest:testNestedPlayPullingActiveReplayCount() (gas: 608396)
+NoncerTest:testNestedPlayPullingActiveReplayCount() (gas: 608321)
 NoncerTest:testPostNestReadsCorrectValue() (gas: 141247)
 PaycallTest:testInitializeProperlyFromConstructor() (gas: 6368)
 PaycallTest:testPaycallForPayWithUSDT() (gas: 116565)
diff --git a/src/quark-core/src/QuarkScript.sol b/src/quark-core/src/QuarkScript.sol
index e2070806..9826c8c0 100644
--- a/src/quark-core/src/QuarkScript.sol
+++ b/src/quark-core/src/QuarkScript.sol
@@ -178,10 +178,6 @@ abstract contract QuarkScript {
         bytes32 submissionToken = getActiveSubmissionToken();
         uint256 n;
 
-        if (submissionToken == QuarkNonceManagerMetadata.EXHAUSTED) {
-            return 0;
-        }
-
         for (n = 0; submissionToken != nonce; n++) {
             submissionToken = keccak256(abi.encodePacked(submissionToken));
         }