diff --git a/cmd/eosio-api-healtcheck/main.go b/cmd/eosio-api-healtcheck/main.go
index e390ca7..1259203 100644
--- a/cmd/eosio-api-healtcheck/main.go
+++ b/cmd/eosio-api-healtcheck/main.go
@@ -176,12 +176,17 @@ func main() {
 	addr = argv_listen_addr()
 
 	// Start listening to TCP Connections
-	err := server.Start(addr)
+	srv, err := server.Start(addr)
 	if err == nil {
 		logger.Info("TCP Server started", "addr", addr)
 
 		// Run the signal event loop.
 		signalEventLoop()
+
+		err = srv.Close()
+		if err != nil {
+			logger.Error("Failed to close server", "error", err)
+		}
 	} else {
 		log.Error("Failed to start tcp server", "error", err)
 	}