diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceBackendFactory.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceBackendFactory.java
index 304a85b..b56488a 100644
--- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceBackendFactory.java
+++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceBackendFactory.java
@@ -120,7 +120,11 @@ public abstract class AccountingPersistenceBackendFactory {
 					AccountingPersistenceBackend.class.getSimpleName(), scope, actual.getClass().getSimpleName());
 			
 			try {
-				
+				lock.lock();
+				logger.trace("Renewing Last check Timestamp. The next one will be {}", now);
+				fallbackLastCheck.put(scope, now);
+				lastCheckTimestamp = fallbackLastCheck.get(scope);
+				lock.unlock();
 				
 				AccountingPersistenceBackend discoveredPersistenceBackend = discoverAccountingPersistenceBackend(scope);
 				
@@ -142,10 +146,6 @@ public abstract class AccountingPersistenceBackendFactory {
 					}
 					lock.unlock();
 					return discoveredPersistenceBackend;
-				}else{
-					logger.trace("Renewing Last check Timestamp. The next one will be {}", now);
-					fallbackLastCheck.put(scope, now);
-					lastCheckTimestamp = fallbackLastCheck.get(scope);
 				}
 			}finally {
 				lock.unlock();