diff --git a/daemon/jobs/certificatesync.go b/daemon/jobs/certificatesync.go
index 4d87b5c..f8ec05f 100644
--- a/daemon/jobs/certificatesync.go
+++ b/daemon/jobs/certificatesync.go
@@ -25,9 +25,7 @@ func CertificateSync() {
 	if !certificateSyncRunning {
 		logrus.Debug("Running Certificate Sync...")
 		certificateSyncRunning = true
-		defer func() {
-			certificateSyncRunning = false
-		}()
+		defer endCertificateSync()
 		claims, err := getClaimsToBeSynced()
 		if err != nil {
 			logrus.Error(certificateSyncPrefix+" Unable to get claims that need certificates checked", errors.Err(err))
@@ -56,6 +54,10 @@ func CertificateSync() {
 	}
 }
 
+func endCertificateSync() {
+	certificateSyncRunning = false
+}
+
 func certifyClaim(claimToBeSynced claimToBeSynced) (bool, error) {
 
 	signedHelper, err := c.DecodeClaimHex(claimToBeSynced.SignedClaimHex, global.BlockChainName)