diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py
index a44160057..65f28d4f1 100644
--- a/libraries/entropy/server/interfaces/mirrors.py
+++ b/libraries/entropy/server/interfaces/mirrors.py
@@ -1576,6 +1576,7 @@ class Server(ServerNoticeBoardMixin):
         dbconn = self.Entropy.open_server_repository(read_only = False,
             no_upload = True, repo = repo, indexing = False,
             do_treeupdates = False)
+        dbconn.doCleanups()
         dbconn.dropAllIndexes()
         dbconn.vacuum()
         dbconn.vacuum()
@@ -1732,11 +1733,6 @@ class Server(ServerNoticeBoardMixin):
             # Package Sets info
             self._show_package_sets_messages(repo)
 
-            # Final tweaks
-            repo_dbconn = self.Entropy.open_server_repository(repo = repo,
-                read_only = False)
-            repo_dbconn.doCleanups()
-
             self._sync_database_treeupdates(repo)
             self.Entropy._update_database_package_sets(repo)
             self.Entropy.close_repositories()