diff --git a/server.go b/server.go
index 1547a0e122..fedd3e84a0 100644
--- a/server.go
+++ b/server.go
@@ -62,6 +62,7 @@ func (srv *Server) Daemon() error {
 		sig := <-c
 		log.Printf("Received signal '%v', exiting\n", sig)
 		utils.RemovePidFile(srv.runtime.config.Pidfile)
+		srv.Close()
 		os.Exit(0)
 	}()