diff --git a/server/entropy-repository-daemon b/server/entropy-repository-daemon
index 67607f1b3..94e635b50 100644
--- a/server/entropy-repository-daemon
+++ b/server/entropy-repository-daemon
@@ -23,5 +23,7 @@ try:
     srv.go()
 except KeyboardInterrupt:
     srv.Gc.kill()
+    if srv.LockScanner != None:
+        srv.LockScanner.kill()
     sys.exit(1)