diff --git a/vm/systemSmartContracts/governance.go b/vm/systemSmartContracts/governance.go
index 9984cf19954..ca92b7d7b55 100644
--- a/vm/systemSmartContracts/governance.go
+++ b/vm/systemSmartContracts/governance.go
@@ -582,7 +582,13 @@ func (g *governanceContract) updateUserVoteListV2(address []byte, nonce uint64,
 		return err
 	}
 
-	return g.saveUserVotesV2(address, userVoteList)
+	err = g.saveUserVotesV2(address, userVoteList)
+	if err != nil {
+		return err
+	}
+
+	lastEndedNonce := g.getLastEndedNonce()
+	return g.clearUserVotes(address, lastEndedNonce)
 }
 
 func (g *governanceContract) updateUserVotesV1(userVoteList *OngoingVotedList, nonce uint64, direct bool) error {
@@ -720,16 +726,12 @@ func (g *governanceContract) closeProposal(args *vmcommon.ContractCallInput) vmc
 		return vmcommon.Ok
 	}
 
-	err = g.processLastEndedNonce(generalProposal.Nonce)
-	if err != nil {
-		g.eei.AddReturnMessage(err.Error())
-		return vmcommon.UserError
-	}
+	g.processLastEndedNonce()
 	return vmcommon.Ok
 }
 
-func (g *governanceContract) clearEndedProposals(addresses [][]byte) vmcommon.ReturnCode {
-	numAddresses := uint64(len(addresses))
+func (g *governanceContract) clearEndedProposals(args *vmcommon.ContractCallInput) vmcommon.ReturnCode {
+	numAddresses := uint64(len(args.Arguments))
 	if numAddresses == 0 {
 		return vmcommon.Ok
 	}
@@ -739,17 +741,45 @@ func (g *governanceContract) clearEndedProposals(addresses [][]byte) vmcommon.Re
 		g.eei.AddReturnMessage("not enough gas")
 		return vmcommon.OutOfGas
 	}
+
+	lastEndedNonce := g.getLastEndedNonce()
 	for i := uint64(0); i < numAddresses; i++ {
-		voter := addresses[i]
+		voter := args.Arguments[i]
 		if len(voter) != len(args.CallerAddr) {
 			g.eei.AddReturnMessage("invalid delegator address")
 			return vmcommon.UserError
 		}
-		err = g.clearUserVotes(voter)
+		err = g.clearUserVotes(voter, lastEndedNonce)
 	}
 	return vmcommon.Ok
 }
 
+func (g *governanceContract) clearUserVotes(address []byte, lastEndedNonce uint64) error {
+	userVoteList, err := g.getUserVotesV2(address)
+	if err != nil {
+		return err
+	}
+
+	clearedUserVoteList := &OngoingVotedListV2{
+		Direct:               make([]uint64, 0),
+		DelegatedWithAddress: make([]*DelegatedWithAddress, 0),
+	}
+
+	for _, delegatedWithAddress := range userVoteList.DelegatedWithAddress {
+		if delegatedWithAddress.Nonce > lastEndedNonce {
+			clearedUserVoteList.DelegatedWithAddress = append(clearedUserVoteList.DelegatedWithAddress, delegatedWithAddress)
+		}
+	}
+
+	for i, direct := range userVoteList.Direct {
+		if direct > lastEndedNonce {
+			clearedUserVoteList.Direct = append(clearedUserVoteList.Direct, userVoteList.Direct[i])
+		}
+	}
+
+	return g.saveUserVotesV2(address, clearedUserVoteList)
+}
+
 func (g *governanceContract) getAccumulatedFees() *big.Int {
 	currentData := g.eei.GetStorage([]byte(accumulatedFeeKey))
 	return big.NewInt(0).SetBytes(currentData)
@@ -1300,37 +1330,35 @@ func (g *governanceContract) convertV2Config(config config.GovernanceSystemSCCon
 	}, nil
 }
 
-func (g *governanceContract) processLastEndedNonce(lastNonce uint64) error {
-	lastEndedNonce, err := g.getLastEndedNonce()
-	if err != nil {
-		return err
-	}
+func (g *governanceContract) processLastEndedNonce() {
+	lastEndedNonce := g.getLastEndedNonce()
 	lastEndedNonceBig := big.NewInt(int64(lastEndedNonce))
+	currentEpoch := g.eei.BlockChainHook().CurrentEpoch()
 
-	for lastEndedNonceBig.Cmp(big.NewInt(int64(lastNonce))) < 0 {
+	var activeProposalFound bool
+	for !activeProposalFound {
+		lastEndedNonceBig = lastEndedNonceBig.Add(lastEndedNonceBig, big.NewInt(1))
 		proposal, err := g.getProposalFromNonce(lastEndedNonceBig)
-		if err != nil {
-			return err
-		}
-
-		if !proposal.Closed {
+		if err != nil || proposal.EndVoteEpoch >= uint64(currentEpoch) {
+			activeProposalFound = true
 			break
 		}
-		lastEndedNonceBig.Add(lastEndedNonceBig, big.NewInt(1))
 	}
 
-	g.eei.SetStorage([]byte(lastEndedNonceKey), lastEndedNonceBig.Bytes())
+	if activeProposalFound {
+		lastEndedNonceBig = lastEndedNonceBig.Sub(lastEndedNonceBig, big.NewInt(1))
+	}
 
-	return nil
+	g.eei.SetStorage([]byte(lastEndedNonceKey), lastEndedNonceBig.Bytes())
 }
 
-func (g *governanceContract) getLastEndedNonce() (uint64, error) {
+func (g *governanceContract) getLastEndedNonce() uint64 {
 	marshaledData := g.eei.GetStorage([]byte(lastEndedNonceKey))
 	if len(marshaledData) == 0 {
-		return 0, vm.ErrElementNotFound
+		return 0
 	}
 
-	return big.NewInt(0).SetBytes(marshaledData).Uint64(), nil
+	return big.NewInt(0).SetBytes(marshaledData).Uint64()
 }
 
 func convertDecimalToPercentage(arg []byte) (float32, error) {
diff --git a/vm/systemSmartContracts/governance.pb.go b/vm/systemSmartContracts/governance.pb.go
index a884dfb6009..f36aacd52b5 100644
--- a/vm/systemSmartContracts/governance.pb.go
+++ b/vm/systemSmartContracts/governance.pb.go
@@ -437,7 +437,7 @@ func (m *OngoingVotedListV2) GetDelegatedWithAddress() []*DelegatedWithAddress {
 }
 
 type DelegatedWithAddress struct {
-	Nonce            uint64 `protobuf:"varint,1,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
+	Nonce            uint64 `protobuf:"varint,1,opt,name=Nonce,proto3" json:"Nonce"`
 	DelegatedAddress []byte `protobuf:"bytes,2,opt,name=DelegatedAddress,proto3" json:"DelegatedAddress"`
 }
 
@@ -560,68 +560,68 @@ func init() {
 func init() { proto.RegisterFile("governance.proto", fileDescriptor_e18a03da5266c714) }
 
 var fileDescriptor_e18a03da5266c714 = []byte{
-	// 971 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
-	0x14, 0x8f, 0xf3, 0xaf, 0xed, 0x34, 0xdd, 0xf5, 0x0e, 0x45, 0xb2, 0x40, 0xf2, 0x54, 0x39, 0x45,
-	0xa0, 0x26, 0x52, 0x41, 0x5a, 0x09, 0x2e, 0xbb, 0xce, 0x96, 0xa5, 0x52, 0x37, 0xdb, 0x75, 0x4b,
-	0x96, 0x45, 0x48, 0x68, 0x62, 0x4f, 0x1d, 0x8b, 0x78, 0xa6, 0xf2, 0x4c, 0xf6, 0x0f, 0x12, 0x12,
-	0x27, 0xae, 0xf0, 0x1d, 0xb8, 0x20, 0x3e, 0x09, 0xc7, 0x1e, 0x7b, 0x32, 0x34, 0xbd, 0x80, 0xc5,
-	0x61, 0x25, 0xbe, 0x00, 0x9a, 0x71, 0xe2, 0x3f, 0x49, 0x0e, 0xac, 0xb0, 0x38, 0xcd, 0xbc, 0xdf,
-	0x9b, 0xf9, 0xfd, 0xfc, 0x9e, 0xdf, 0xcc, 0x3c, 0xa0, 0x7b, 0xec, 0x39, 0x09, 0x29, 0xa6, 0x0e,
-	0xe9, 0x5e, 0x84, 0x4c, 0x30, 0xd8, 0x50, 0xc3, 0x3b, 0xfb, 0x9e, 0x2f, 0xc6, 0xd3, 0x51, 0xd7,
-	0x61, 0x41, 0xcf, 0x63, 0x1e, 0xeb, 0x29, 0x78, 0x34, 0x3d, 0x57, 0x96, 0x32, 0xd4, 0x2c, 0xd9,
-	0xd5, 0xfe, 0x6b, 0x03, 0xdc, 0x7e, 0x48, 0x28, 0x09, 0xf1, 0xe4, 0x24, 0x64, 0x17, 0x8c, 0xe3,
-	0x09, 0x44, 0xa0, 0x31, 0x60, 0xd4, 0x21, 0x86, 0xb6, 0xa7, 0x75, 0xea, 0xd6, 0x56, 0x1c, 0xa1,
-	0x04, 0xb0, 0x93, 0x01, 0x76, 0x01, 0xe8, 0xb3, 0x20, 0xf0, 0xc5, 0xa7, 0x98, 0x8f, 0x8d, 0xea,
-	0x9e, 0xd6, 0x69, 0x59, 0xb7, 0xe2, 0x08, 0xe5, 0x50, 0x3b, 0x37, 0x87, 0x1f, 0x81, 0x5b, 0xa7,
-	0x02, 0x87, 0x62, 0xc8, 0x04, 0x39, 0xbc, 0x60, 0xce, 0xd8, 0xa8, 0x29, 0x66, 0x18, 0x47, 0x68,
-	0xc9, 0x63, 0x2f, 0xd9, 0xf0, 0x43, 0xd0, 0x3a, 0xa4, 0x6e, 0xb6, 0xb3, 0xae, 0x76, 0xea, 0x71,
-	0x84, 0x0a, 0xb8, 0x5d, 0xb0, 0xe0, 0x08, 0xd4, 0x9e, 0x11, 0x6e, 0x34, 0xd4, 0xa7, 0x9d, 0xc4,
-	0x11, 0x92, 0xe6, 0x2f, 0xbf, 0xa1, 0xc3, 0x00, 0x8b, 0x71, 0x6f, 0xe4, 0x7b, 0xdd, 0x23, 0x2a,
-	0x3e, 0xce, 0xa5, 0x2a, 0x98, 0x4e, 0x84, 0xff, 0x9c, 0x84, 0xfc, 0x65, 0x2f, 0x78, 0xb9, 0xef,
-	0x8c, 0xb1, 0x4f, 0xf7, 0x1d, 0x16, 0x92, 0x7d, 0x8f, 0xf5, 0x5c, 0x2c, 0x70, 0xd7, 0xf2, 0xbd,
-	0x23, 0x2a, 0xfa, 0x98, 0x0b, 0x12, 0xda, 0x92, 0x0d, 0x7e, 0x05, 0xaa, 0x03, 0x66, 0x34, 0x95,
-	0xc4, 0xe3, 0x38, 0x42, 0xd5, 0x01, 0x2b, 0x4f, 0xa1, 0x3a, 0x60, 0x90, 0x80, 0xfa, 0x90, 0x08,
-	0x66, 0x6c, 0x28, 0x89, 0x27, 0x71, 0x84, 0x94, 0x5d, 0x9e, 0x88, 0xa2, 0x83, 0x14, 0x6c, 0xdc,
-	0x1f, 0x71, 0x81, 0x7d, 0x6a, 0x6c, 0x2a, 0xa5, 0xb3, 0x38, 0x42, 0x0b, 0xa8, 0x3c, 0xb1, 0x05,
-	0x23, 0xfc, 0x06, 0x6c, 0x3f, 0x99, 0xb2, 0x70, 0x1a, 0x9c, 0x0a, 0xfc, 0x35, 0x31, 0xb6, 0x94,
-	0xe6, 0xe7, 0x71, 0x84, 0xf2, 0x70, 0x79, 0xba, 0x79, 0x56, 0xd8, 0x06, 0xcd, 0x13, 0xcc, 0x39,
-	0x71, 0x0d, 0xb0, 0xa7, 0x75, 0x36, 0x2d, 0x10, 0x47, 0x68, 0x8e, 0xd8, 0xf3, 0x51, 0xae, 0xe9,
-	0x4f, 0x98, 0x5c, 0xb3, 0x9d, 0xad, 0x49, 0x10, 0x7b, 0x3e, 0xc2, 0xbb, 0x60, 0xe7, 0x88, 0xf3,
-	0x29, 0x09, 0xef, 0xbb, 0x6e, 0x48, 0x38, 0x37, 0x5a, 0x2a, 0x8a, 0x3b, 0x71, 0x84, 0x8a, 0x0e,
-	0xbb, 0x68, 0xc2, 0x6f, 0x41, 0x6b, 0x71, 0xce, 0xfa, 0x8c, 0x0b, 0x63, 0x47, 0xed, 0x7b, 0x26,
-	0xcb, 0x39, 0x8f, 0x97, 0x17, 0x7e, 0x81, 0xb6, 0xfd, 0x67, 0x15, 0xe8, 0x0f, 0xd3, 0x9b, 0xa3,
-	0xcf, 0xe8, 0xb9, 0xef, 0xc1, 0x0e, 0xd8, 0x1c, 0x4c, 0x83, 0x01, 0x73, 0x09, 0x57, 0x47, 0xbe,
-	0x66, 0xb5, 0xe2, 0x08, 0xa5, 0x98, 0x9d, 0xce, 0xe0, 0xfb, 0x60, 0xeb, 0x91, 0x4f, 0x93, 0x84,
-	0xaa, 0x73, 0xdf, 0xb0, 0x76, 0xe2, 0x08, 0x65, 0xa0, 0x9d, 0x4d, 0xe1, 0x3d, 0xa0, 0x3f, 0xf2,
-	0xa9, 0x4c, 0xea, 0xd9, 0x38, 0x24, 0x7c, 0xcc, 0x26, 0xae, 0x3a, 0xf7, 0x0d, 0x6b, 0x37, 0x8e,
-	0xd0, 0x8a, 0xcf, 0x5e, 0x41, 0xe6, 0x0c, 0xb2, 0x48, 0x33, 0x86, 0x7a, 0x81, 0xa1, 0xe0, 0xb3,
-	0x57, 0x10, 0x59, 0x6b, 0x8b, 0xf8, 0x3f, 0x21, 0x64, 0x7e, 0x1f, 0xa8, 0x5a, 0xcb, 0xc1, 0x25,
-	0xd6, 0x5a, 0x8e, 0xb5, 0xfd, 0x43, 0x1d, 0xc0, 0xe5, 0x5c, 0x0f, 0x0f, 0x8a, 0x39, 0x94, 0xe9,
-	0xae, 0xbe, 0x61, 0x0e, 0xab, 0x6a, 0xcf, 0x7f, 0xc9, 0x61, 0xad, 0xc0, 0xf0, 0x86, 0x39, 0xac,
-	0xff, 0x8f, 0x39, 0x84, 0xdf, 0x6b, 0xe0, 0xf6, 0x31, 0xe3, 0x62, 0xf5, 0x27, 0x7e, 0x19, 0x47,
-	0x68, 0xd9, 0x55, 0xde, 0x47, 0x2c, 0x33, 0xc3, 0x3e, 0xb8, 0x73, 0x8c, 0x33, 0x28, 0x79, 0x1f,
-	0x9b, 0xea, 0x2d, 0x7a, 0x3b, 0x8e, 0xd0, 0xaa, 0xd3, 0x5e, 0x85, 0xda, 0x0e, 0xd0, 0x1f, 0x53,
-	0x8f, 0xf9, 0xd4, 0x93, 0x2f, 0x95, 0x7b, 0xec, 0x73, 0x21, 0x6f, 0x9b, 0x07, 0x7e, 0x48, 0x1c,
-	0x61, 0x68, 0x7b, 0xb5, 0x4e, 0x3d, 0xb9, 0x6d, 0x12, 0xc4, 0x9e, 0x8f, 0xb2, 0x64, 0x1e, 0x90,
-	0x09, 0xf1, 0xb0, 0x20, 0xf2, 0xf7, 0xcb, 0x65, 0xaa, 0x64, 0x52, 0xd0, 0xce, 0xa6, 0xed, 0x9f,
-	0x34, 0x00, 0x97, 0x55, 0x86, 0x07, 0xff, 0x4a, 0xc7, 0x07, 0xbb, 0x29, 0xcf, 0x53, 0x5f, 0x8c,
-	0x17, 0x97, 0x9b, 0x94, 0xdc, 0x3e, 0x78, 0x37, 0x69, 0x19, 0xba, 0xeb, 0x96, 0x58, 0x46, 0x1c,
-	0xa1, 0xb5, 0x9b, 0xed, 0xb5, 0x68, 0x9b, 0xae, 0x97, 0x82, 0xbb, 0x85, 0xde, 0x63, 0xd1, 0x70,
-	0xdc, 0x03, 0x7a, 0xba, 0x3a, 0xfb, 0x28, 0x59, 0x06, 0xaa, 0x88, 0x97, 0x7d, 0xf6, 0x0a, 0xd2,
-	0xfe, 0xbb, 0x06, 0xde, 0x4a, 0xc1, 0xd3, 0xbe, 0xcc, 0xcc, 0x11, 0x3d, 0x67, 0xf0, 0x05, 0x00,
-	0x67, 0x4c, 0xe0, 0xc9, 0x09, 0x7b, 0x41, 0x42, 0x25, 0xda, 0xb2, 0x9e, 0xca, 0x56, 0x26, 0x43,
-	0xcb, 0xab, 0xaa, 0x1c, 0x29, 0x14, 0x60, 0xeb, 0x33, 0x4e, 0xdc, 0x44, 0x37, 0x89, 0x65, 0x28,
-	0xff, 0x69, 0x0a, 0x96, 0x27, 0x9b, 0x71, 0xa6, 0xe1, 0x26, 0x4f, 0x6f, 0x6d, 0x29, 0xdc, 0x92,
-	0x5f, 0xde, 0x1c, 0xe9, 0x22, 0xdc, 0x44, 0xb7, 0x5e, 0x0c, 0xb7, 0x64, 0xd9, 0x8c, 0xf3, 0xbd,
-	0xbb, 0x60, 0x47, 0xfe, 0xe9, 0x21, 0x9e, 0x4c, 0xc9, 0xd9, 0xab, 0x0b, 0x02, 0x37, 0x54, 0x5f,
-	0xa8, 0x57, 0x60, 0x53, 0x36, 0x6f, 0xba, 0x06, 0x37, 0x93, 0x1e, 0x4b, 0xaf, 0xc2, 0xed, 0xb4,
-	0x0d, 0xd2, 0x6b, 0xd6, 0xe0, 0xf2, 0xda, 0xac, 0x5c, 0x5d, 0x9b, 0x95, 0xd7, 0xd7, 0xa6, 0xf6,
-	0xdd, 0xcc, 0xd4, 0x7e, 0x9e, 0x99, 0xda, 0xaf, 0x33, 0x53, 0xbb, 0x9c, 0x99, 0xda, 0xd5, 0xcc,
-	0xd4, 0x7e, 0x9f, 0x99, 0xda, 0x1f, 0x33, 0xb3, 0xf2, 0x7a, 0x66, 0x6a, 0x3f, 0xde, 0x98, 0x95,
-	0xcb, 0x1b, 0xb3, 0x72, 0x75, 0x63, 0x56, 0xbe, 0xd8, 0xe5, 0xaf, 0xb8, 0x20, 0xc1, 0x69, 0x80,
-	0x43, 0xd1, 0x67, 0x54, 0x84, 0xd8, 0x11, 0x7c, 0xd4, 0x54, 0x47, 0xe7, 0x83, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x1c, 0x53, 0x09, 0x81, 0xb7, 0x0b, 0x00, 0x00,
+	// 968 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0xf7, 0xfa, 0x5f, 0x92, 0x89, 0xd3, 0x6e, 0x87, 0x20, 0xad, 0x40, 0xda, 0x89, 0x7c, 0xb2,
+	0x40, 0xb1, 0xa5, 0x80, 0x54, 0x09, 0x2e, 0xed, 0xba, 0xa1, 0x44, 0x4a, 0xdd, 0x74, 0x13, 0x5c,
+	0x8a, 0x90, 0xd0, 0x78, 0x77, 0xb2, 0x5e, 0xe1, 0xdd, 0x89, 0x76, 0xc6, 0x6d, 0x83, 0x84, 0xc4,
+	0x89, 0x2b, 0x7c, 0x07, 0x2e, 0x88, 0x4f, 0xc2, 0x31, 0xc7, 0x9c, 0x16, 0xe2, 0x5c, 0x60, 0xc4,
+	0xa1, 0x12, 0x5f, 0x00, 0xcd, 0xac, 0xbd, 0x7f, 0xec, 0x48, 0x50, 0xb1, 0xea, 0x69, 0x66, 0x7e,
+	0x6f, 0xde, 0xef, 0xb7, 0xef, 0xed, 0x9b, 0x99, 0x07, 0x74, 0x8f, 0x3e, 0x27, 0x51, 0x88, 0x43,
+	0x87, 0x74, 0xcf, 0x22, 0xca, 0x29, 0x6c, 0xa8, 0xe1, 0x9d, 0x5d, 0xcf, 0xe7, 0xe3, 0xe9, 0xa8,
+	0xeb, 0xd0, 0xa0, 0xe7, 0x51, 0x8f, 0xf6, 0x14, 0x3c, 0x9a, 0x9e, 0xaa, 0x95, 0x5a, 0xa8, 0x59,
+	0xe2, 0xd5, 0xfe, 0x6b, 0x0d, 0xdc, 0x7e, 0x48, 0x42, 0x12, 0xe1, 0xc9, 0x51, 0x44, 0xcf, 0x28,
+	0xc3, 0x13, 0x88, 0x40, 0x63, 0x40, 0x43, 0x87, 0x18, 0xda, 0x8e, 0xd6, 0xa9, 0x5b, 0x1b, 0x22,
+	0x46, 0x09, 0x60, 0x27, 0x03, 0xec, 0x02, 0xd0, 0xa7, 0x41, 0xe0, 0xf3, 0x4f, 0x31, 0x1b, 0x1b,
+	0xd5, 0x1d, 0xad, 0xd3, 0xb2, 0x6e, 0x89, 0x18, 0xe5, 0x50, 0x3b, 0x37, 0x87, 0x1f, 0x81, 0x5b,
+	0xc7, 0x1c, 0x47, 0x7c, 0x48, 0x39, 0xd9, 0x3f, 0xa3, 0xce, 0xd8, 0xa8, 0x29, 0x66, 0x28, 0x62,
+	0xb4, 0x64, 0xb1, 0x97, 0xd6, 0xf0, 0x43, 0xd0, 0xda, 0x0f, 0xdd, 0xcc, 0xb3, 0xae, 0x3c, 0x75,
+	0x11, 0xa3, 0x02, 0x6e, 0x17, 0x56, 0x70, 0x04, 0x6a, 0xcf, 0x08, 0x33, 0x1a, 0xea, 0xd3, 0x8e,
+	0x44, 0x8c, 0xe4, 0xf2, 0x97, 0xdf, 0xd0, 0x7e, 0x80, 0xf9, 0xb8, 0x37, 0xf2, 0xbd, 0xee, 0x41,
+	0xc8, 0x3f, 0xce, 0xa5, 0x2a, 0x98, 0x4e, 0xb8, 0xff, 0x9c, 0x44, 0xec, 0x65, 0x2f, 0x78, 0xb9,
+	0xeb, 0x8c, 0xb1, 0x1f, 0xee, 0x3a, 0x34, 0x22, 0xbb, 0x1e, 0xed, 0xb9, 0x98, 0xe3, 0xae, 0xe5,
+	0x7b, 0x07, 0x21, 0xef, 0x63, 0xc6, 0x49, 0x64, 0x4b, 0x36, 0xf8, 0x15, 0xa8, 0x0e, 0xa8, 0xd1,
+	0x54, 0x12, 0x8f, 0x45, 0x8c, 0xaa, 0x03, 0x5a, 0x9e, 0x42, 0x75, 0x40, 0x21, 0x01, 0xf5, 0x21,
+	0xe1, 0xd4, 0x58, 0x53, 0x12, 0x4f, 0x44, 0x8c, 0xd4, 0xba, 0x3c, 0x11, 0x45, 0x07, 0x43, 0xb0,
+	0x76, 0x7f, 0xc4, 0x38, 0xf6, 0x43, 0x63, 0x5d, 0x29, 0x9d, 0x88, 0x18, 0x2d, 0xa0, 0xf2, 0xc4,
+	0x16, 0x8c, 0xf0, 0x1b, 0xb0, 0xf9, 0x64, 0x4a, 0xa3, 0x69, 0x70, 0xcc, 0xf1, 0xd7, 0xc4, 0xd8,
+	0x50, 0x9a, 0x9f, 0x8b, 0x18, 0xe5, 0xe1, 0xf2, 0x74, 0xf3, 0xac, 0xb0, 0x0d, 0x9a, 0x47, 0x98,
+	0x31, 0xe2, 0x1a, 0x60, 0x47, 0xeb, 0xac, 0x5b, 0x40, 0xc4, 0x68, 0x8e, 0xd8, 0xf3, 0x51, 0xee,
+	0xe9, 0x4f, 0xa8, 0xdc, 0xb3, 0x99, 0xed, 0x49, 0x10, 0x7b, 0x3e, 0xc2, 0xbb, 0x60, 0xeb, 0x80,
+	0xb1, 0x29, 0x89, 0xee, 0xbb, 0x6e, 0x44, 0x18, 0x33, 0x5a, 0x2a, 0x8a, 0x3b, 0x22, 0x46, 0x45,
+	0x83, 0x5d, 0x5c, 0xc2, 0x6f, 0x41, 0x6b, 0x71, 0xce, 0xfa, 0x94, 0x71, 0x63, 0x4b, 0xf9, 0x3d,
+	0x93, 0xe5, 0x9c, 0xc7, 0xcb, 0x0b, 0xbf, 0x40, 0xdb, 0xfe, 0xb3, 0x0a, 0xf4, 0x87, 0xe9, 0xcd,
+	0xd1, 0xa7, 0xe1, 0xa9, 0xef, 0xc1, 0x0e, 0x58, 0x1f, 0x4c, 0x83, 0x01, 0x75, 0x09, 0x53, 0x47,
+	0xbe, 0x66, 0xb5, 0x44, 0x8c, 0x52, 0xcc, 0x4e, 0x67, 0xf0, 0x7d, 0xb0, 0xf1, 0xc8, 0x0f, 0x93,
+	0x84, 0xaa, 0x73, 0xdf, 0xb0, 0xb6, 0x44, 0x8c, 0x32, 0xd0, 0xce, 0xa6, 0xf0, 0x1e, 0xd0, 0x1f,
+	0xf9, 0xa1, 0x4c, 0xea, 0xc9, 0x38, 0x22, 0x6c, 0x4c, 0x27, 0xae, 0x3a, 0xf7, 0x0d, 0x6b, 0x5b,
+	0xc4, 0x68, 0xc5, 0x66, 0xaf, 0x20, 0x73, 0x06, 0x59, 0xa4, 0x19, 0x43, 0xbd, 0xc0, 0x50, 0xb0,
+	0xd9, 0x2b, 0x88, 0xac, 0xb5, 0x45, 0xfc, 0x9f, 0x10, 0x32, 0xbf, 0x0f, 0x54, 0xad, 0xe5, 0xe0,
+	0x12, 0x6b, 0x2d, 0xc7, 0xda, 0xfe, 0xa1, 0x0e, 0xe0, 0x72, 0xae, 0x87, 0x7b, 0xc5, 0x1c, 0xca,
+	0x74, 0x57, 0x5f, 0x33, 0x87, 0x55, 0xe5, 0xf3, 0x7f, 0x72, 0x58, 0x2b, 0x30, 0xbc, 0x66, 0x0e,
+	0xeb, 0x6f, 0x30, 0x87, 0xf0, 0x7b, 0x0d, 0xdc, 0x3e, 0xa4, 0x8c, 0xaf, 0xfe, 0xc4, 0x2f, 0x45,
+	0x8c, 0x96, 0x4d, 0xe5, 0x7d, 0xc4, 0x32, 0x33, 0xec, 0x83, 0x3b, 0x87, 0x38, 0x83, 0x92, 0xf7,
+	0xb1, 0xa9, 0xde, 0xa2, 0xb7, 0x45, 0x8c, 0x56, 0x8d, 0xf6, 0x2a, 0xd4, 0x76, 0x80, 0xfe, 0x38,
+	0xf4, 0xa8, 0x1f, 0x7a, 0xf2, 0xa5, 0x72, 0x0f, 0x7d, 0xc6, 0xe5, 0x6d, 0xf3, 0xc0, 0x8f, 0x88,
+	0xc3, 0x0d, 0x6d, 0xa7, 0xd6, 0xa9, 0x27, 0xb7, 0x4d, 0x82, 0xd8, 0xf3, 0x51, 0x96, 0xcc, 0x03,
+	0x32, 0x21, 0x1e, 0xe6, 0x44, 0xfe, 0x7e, 0xb9, 0x4d, 0x95, 0x4c, 0x0a, 0xda, 0xd9, 0xb4, 0xfd,
+	0x93, 0x06, 0xe0, 0xb2, 0xca, 0x70, 0xef, 0x3f, 0xe9, 0xf8, 0x60, 0x3b, 0xe5, 0x79, 0xea, 0xf3,
+	0xf1, 0xe2, 0x72, 0x93, 0x92, 0x9b, 0x7b, 0xef, 0x26, 0x2d, 0x43, 0xf7, 0xa6, 0x2d, 0x96, 0x21,
+	0x62, 0x74, 0xa3, 0xb3, 0x7d, 0x23, 0xda, 0x3e, 0xbf, 0x59, 0xea, 0xdf, 0x7b, 0x8f, 0x7b, 0x40,
+	0x4f, 0x1d, 0xb3, 0xef, 0x93, 0x15, 0xa1, 0xea, 0x79, 0xd9, 0x66, 0xaf, 0x20, 0xed, 0xbf, 0x6b,
+	0xe0, 0xad, 0x14, 0x3c, 0xee, 0xcb, 0x24, 0x1d, 0x84, 0xa7, 0x14, 0xbe, 0x00, 0xe0, 0x84, 0x72,
+	0x3c, 0x39, 0xa2, 0x2f, 0x48, 0xa4, 0xf4, 0x5b, 0xd6, 0x53, 0xd9, 0xd5, 0x64, 0x68, 0x79, 0x05,
+	0x96, 0x23, 0x85, 0x1c, 0x6c, 0x7c, 0xc6, 0x88, 0x9b, 0xe8, 0x26, 0xb1, 0x0c, 0xe5, 0xef, 0x4d,
+	0xc1, 0xf2, 0x64, 0x33, 0xce, 0x34, 0xdc, 0xe4, 0x15, 0xae, 0x2d, 0x85, 0x5b, 0xf2, 0x23, 0x9c,
+	0x23, 0x5d, 0x84, 0x9b, 0xe8, 0xd6, 0x8b, 0xe1, 0x96, 0x2c, 0x9b, 0x71, 0xbe, 0x77, 0x17, 0x6c,
+	0xc9, 0x3f, 0x3d, 0xc4, 0x93, 0x29, 0x39, 0x39, 0x3f, 0x23, 0x70, 0x4d, 0xb5, 0x88, 0x7a, 0x05,
+	0x36, 0x65, 0x1f, 0xa7, 0x6b, 0x70, 0x3d, 0x69, 0xb7, 0xf4, 0x2a, 0xdc, 0x4c, 0x3b, 0x22, 0xbd,
+	0x66, 0x0d, 0x2e, 0xae, 0xcc, 0xca, 0xe5, 0x95, 0x59, 0x79, 0x75, 0x65, 0x6a, 0xdf, 0xcd, 0x4c,
+	0xed, 0xe7, 0x99, 0xa9, 0xfd, 0x3a, 0x33, 0xb5, 0x8b, 0x99, 0xa9, 0x5d, 0xce, 0x4c, 0xed, 0xf7,
+	0x99, 0xa9, 0xfd, 0x31, 0x33, 0x2b, 0xaf, 0x66, 0xa6, 0xf6, 0xe3, 0xb5, 0x59, 0xb9, 0xb8, 0x36,
+	0x2b, 0x97, 0xd7, 0x66, 0xe5, 0x8b, 0x6d, 0x76, 0xce, 0x38, 0x09, 0x8e, 0x03, 0x1c, 0xf1, 0x3e,
+	0x0d, 0x79, 0x84, 0x1d, 0xce, 0x46, 0x4d, 0x75, 0x8a, 0x3e, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff,
+	0xe3, 0x61, 0x5d, 0xd5, 0xc2, 0x0b, 0x00, 0x00,
 }
 
 func (x VoteValueType) String() string {
diff --git a/vm/systemSmartContracts/governance.proto b/vm/systemSmartContracts/governance.proto
index ba245d0f7d4..72bd4915f3c 100644
--- a/vm/systemSmartContracts/governance.proto
+++ b/vm/systemSmartContracts/governance.proto
@@ -58,7 +58,7 @@ message OngoingVotedListV2 {
 }
 
 message DelegatedWithAddress {
-    uint64 Nonce = 1;
+    uint64 Nonce = 1 [(gogoproto.jsontag) = "Nonce"];
     bytes  DelegatedAddress  = 2 [(gogoproto.jsontag) = "DelegatedAddress"];
 }
 
diff --git a/vm/systemSmartContracts/governance_test.go b/vm/systemSmartContracts/governance_test.go
index 00c19b79903..4d18873e2b2 100644
--- a/vm/systemSmartContracts/governance_test.go
+++ b/vm/systemSmartContracts/governance_test.go
@@ -1486,6 +1486,175 @@ func TestGovernanceContract_CloseProposalComputeResultsErr(t *testing.T) {
 	require.Contains(t, retMessage, errSubstr)
 }
 
+func TestGovernanceContract_CloseProposalAfterGovernanceFixesShouldSetLastEndedNonce(t *testing.T) {
+	t.Parallel()
+
+	callerAddress := []byte("address")
+	gsc, blockchainHook, _ := createGovernanceBlockChainHookStubContextHandler()
+	gsc.enableEpochsHandler = enableEpochsHandlerMock.NewEnableEpochsHandlerStub(common.GovernanceFlag, common.GovernanceDisableProposeFlag, common.GovernanceFixesFlag)
+	currentEpoch := uint32(17)
+	blockchainHook.CurrentEpochCalled = func() uint32 {
+		return currentEpoch
+	}
+
+	generalProposal := &GeneralProposal{
+		Nonce:          1,
+		CommitHash:     bytes.Repeat([]byte("a"), commitHashLength),
+		StartVoteEpoch: 10,
+		EndVoteEpoch:   15,
+		Yes:            big.NewInt(0),
+		No:             big.NewInt(0),
+		Veto:           big.NewInt(0),
+		Abstain:        big.NewInt(0),
+		ProposalCost:   big.NewInt(10),
+	}
+	nonceKey := append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	callInputArgs := [][]byte{{1}}
+	callInput := createVMInput(zero, "closeProposal", callerAddress, vm.GovernanceSCAddress, callInputArgs)
+	retCode := gsc.Execute(callInput)
+
+	require.Equal(t, vmcommon.Ok, retCode)
+	lastEndedNonce := gsc.getLastEndedNonce()
+	require.Equal(t, generalProposal.Nonce, lastEndedNonce)
+
+	generalProposal.Nonce = 2
+	generalProposal.CommitHash = bytes.Repeat([]byte("b"), commitHashLength)
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	generalProposal.Nonce = 3
+	generalProposal.CommitHash = bytes.Repeat([]byte("c"), commitHashLength)
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	generalProposal.Nonce = 4
+	generalProposal.CommitHash = bytes.Repeat([]byte("d"), commitHashLength)
+	generalProposal.EndVoteEpoch = 18
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	generalProposal.Nonce = 5
+	generalProposal.CommitHash = bytes.Repeat([]byte("e"), commitHashLength)
+	generalProposal.EndVoteEpoch = 15
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	generalProposal.Nonce = 6
+	generalProposal.CommitHash = bytes.Repeat([]byte("f"), commitHashLength)
+	generalProposal.EndVoteEpoch = 15
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	generalProposal.Nonce = 7
+	generalProposal.CommitHash = bytes.Repeat([]byte("g"), commitHashLength)
+	generalProposal.StartVoteEpoch = 15
+	generalProposal.EndVoteEpoch = 20
+	nonceKey = append([]byte(noncePrefix), big.NewInt(int64(generalProposal.Nonce)).Bytes()...)
+	gsc.eei.SetStorage(nonceKey, generalProposal.CommitHash)
+	_ = gsc.saveGeneralProposal(generalProposal.CommitHash, generalProposal)
+
+	currentEpoch = 18
+	callInput.Arguments = [][]byte{{3}}
+	retCode = gsc.Execute(callInput)
+
+	require.Equal(t, vmcommon.Ok, retCode)
+	lastEndedNonce = gsc.getLastEndedNonce()
+	require.Equal(t, uint64(3), lastEndedNonce)
+
+	callInput.Arguments = [][]byte{{6}}
+	retCode = gsc.Execute(callInput)
+
+	require.Equal(t, vmcommon.Ok, retCode)
+	lastEndedNonce = gsc.getLastEndedNonce()
+	require.Equal(t, uint64(3), lastEndedNonce)
+
+	currentEpoch = 19
+	callInput.Arguments = [][]byte{{4}}
+	retCode = gsc.Execute(callInput)
+
+	require.Equal(t, vmcommon.Ok, retCode)
+	lastEndedNonce = gsc.getLastEndedNonce()
+	require.Equal(t, uint64(6), lastEndedNonce)
+}
+
+func TestGovernanceContract_ClearEndedProposalsNoArguments(t *testing.T) {
+	t.Parallel()
+
+	callerAddress := []byte("address")
+	args := createMockGovernanceArgs()
+	isCalled := false
+	args.Eei = &mock.SystemEIStub{
+		UseGasCalled: func(gas uint64) error {
+			isCalled = true
+			return nil
+		},
+	}
+
+	gsc, _ := NewGovernanceContract(args)
+	callInput := createVMInput(zero, "clearEndedProposals", callerAddress, vm.GovernanceSCAddress, make([][]byte, 0))
+	retCode := gsc.Execute(callInput)
+
+	// Assert
+	require.Equal(t, vmcommon.Ok, retCode)
+	require.False(t, isCalled)
+}
+
+func TestGovernanceContract_ClearEndedProposalsBadArguments(t *testing.T) {
+	t.Parallel()
+
+	callerAddress := bytes.Repeat([]byte{2}, 32)
+	gsc, _, eei := createGovernanceBlockChainHookStubContextHandler()
+	callInputArgs := [][]byte{
+		bytes.Repeat([]byte{2}, 31),
+	}
+	callInput := createVMInput(zero, "clearEndedProposals", callerAddress, vm.GovernanceSCAddress, callInputArgs)
+	retCode := gsc.Execute(callInput)
+
+	require.Equal(t, vmcommon.UserError, retCode)
+	require.Equal(t, eei.GetReturnMessage(), "invalid delegator address")
+}
+
+func TestGovernanceContract_ClearEndedProposalsOutOfGas(t *testing.T) {
+	t.Parallel()
+
+	callerAddress := []byte("address")
+	args := createMockGovernanceArgs()
+	args.GasCost.MetaChainSystemSCsCost.ClearProposal = 10
+	args.Eei = &mock.SystemEIStub{
+		UseGasCalled: func(gas uint64) error {
+			if gas <= args.GasCost.MetaChainSystemSCsCost.ClearProposal*3 {
+				return nil
+			}
+			return vm.ErrNotEnoughGas
+		},
+	}
+	gsc, _ := NewGovernanceContract(args)
+
+	callInputArgs := [][]byte{
+		callerAddress,
+	}
+	callInput := createVMInput(zero, "clearEndedProposals", callerAddress, vm.GovernanceSCAddress, callInputArgs)
+	retCode := gsc.Execute(callInput)
+	require.Equal(t, vmcommon.Ok, retCode)
+
+	callInput.Arguments = [][]byte{
+		callerAddress,
+		callerAddress,
+		callerAddress,
+		callerAddress,
+	}
+	retCode = gsc.Execute(callInput)
+	require.Equal(t, vmcommon.OutOfGas, retCode)
+}
+
 func TestGovernanceContract_GetVotingPower(t *testing.T) {
 	t.Parallel()