diff --git a/src/Governance.sol b/src/Governance.sol
index fd9bf065..7bfaa1f7 100644
--- a/src/Governance.sol
+++ b/src/Governance.sol
@@ -125,8 +125,6 @@ contract Governance is Multicall, UserProxyFactory, ReentrancyGuard, Ownable, IG
 
     function registerInitialInitiatives(address[] memory _initiatives) public onlyOwner {
         for (uint256 i = 0; i < _initiatives.length; i++) {
-            initiativeStates[_initiatives[i]] = InitiativeState(0, 0, 0, 0, 0);
-
             // Register initial initiatives in the earliest possible epoch, which lets us make them votable immediately
             // post-deployment if we so choose, by backdating the first epoch at least EPOCH_DURATION in the past.
             registeredInitiatives[_initiatives[i]] = 1;
@@ -574,7 +572,7 @@ contract Governance is Multicall, UserProxyFactory, ReentrancyGuard, Ownable, IG
         registeredInitiatives[_initiative] = currentEpoch;
 
         /// @audit This ensures that the initiatives has UNREGISTRATION_AFTER_EPOCHS even after the first epoch
-        initiativeStates[_initiative].lastEpochClaim = epoch() - 1;
+        initiativeStates[_initiative].lastEpochClaim = currentEpoch - 1;
 
         emit RegisterInitiative(_initiative, msg.sender, currentEpoch);