diff --git a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
index e092246..75f0169 100644
--- a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
+++ b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
@@ -26,8 +26,7 @@ public class AccountingManager extends ContainerHandler {
 	@Override
 	public void onStop(ContainerLifecycleEvent.Stop e) {
 		logger.trace("Going to flush accounting data");
-		AccountingPersistenceFactory.flushAll(1000, TimeUnit.MILLISECONDS);
-		AccountingPersistenceFactory.shutDown();
+		AccountingPersistenceFactory.shutDown(1000, TimeUnit.MILLISECONDS);
 	}
 	
 	@Override