diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py
index 2c7c1c687..f5740e6ff 100644
--- a/libraries/entropy/server/interfaces/main.py
+++ b/libraries/entropy/server/interfaces/main.py
@@ -197,10 +197,7 @@ class ServerEntropyRepositoryPlugin(EntropyRepositoryPlugin):
             # atomic !
             os.rename(tmp_revision_file, revision_file)
 
-        # auto-update package sets
-        cur_sets = entropy_repository_instance.retrievePackageSets()
-        sys_sets = self._server._get_configured_package_sets(repo)
-        if cur_sets != sys_sets:
+            # auto-update package sets
             self._server.output(
                 "[repo:%s|%s] %s" % (
                         blue(repo),
@@ -211,8 +208,11 @@ class ServerEntropyRepositoryPlugin(EntropyRepositoryPlugin):
                 level = "info",
                 header = brown(" @@ ")
             )
-            self._server._update_database_package_sets(repo,
-                dbconn = entropy_repository_instance)
+            cur_sets = entropy_repository_instance.retrievePackageSets()
+            sys_sets = self._server._get_configured_package_sets(repo)
+            if cur_sets != sys_sets:
+                self._server._update_database_package_sets(repo,
+                    dbconn = entropy_repository_instance)
             entropy_repository_instance.commitChanges(no_plugins = True)
 
         return 0