diff --git a/server/eit/commands/command.py b/server/eit/commands/command.py
index a410897af..07c456bb4 100644
--- a/server/eit/commands/command.py
+++ b/server/eit/commands/command.py
@@ -223,9 +223,9 @@ class EitCommand(object):
             return func(server)
         finally:
             if server is not None:
+                server.shutdown()
                 if acquired:
                     entropy.tools.release_entropy_locks(server)
-                server.shutdown()
 
     def _call_unlocked(self, func, repo):
         """
@@ -262,9 +262,9 @@ class EitCommand(object):
             return func(server)
         finally:
             if server is not None:
+                server.shutdown()
                 if acquired:
                     entropy.tools.release_entropy_locks(server)
-                server.shutdown()
 
     def _settings(self):
         """