diff --git a/apiserver/eurekaserver/server_test.go b/apiserver/eurekaserver/server_test.go
index 238d96c33..ecada2ff3 100644
--- a/apiserver/eurekaserver/server_test.go
+++ b/apiserver/eurekaserver/server_test.go
@@ -18,6 +18,7 @@
 package eurekaserver
 
 import (
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -104,3 +105,16 @@ func Test_parsePeersToReplicate(t *testing.T) {
 		})
 	}
 }
+
+func TestEurekaServer_Stop(t *testing.T) {
+	t.Run("stop server", func(t *testing.T) {
+		eurekaServer := &EurekaServer{
+			server: &http.Server{
+				Addr: ":8761",
+			},
+			workers: &ApplicationsWorkers{},
+		}
+		go eurekaServer.server.ListenAndServe()
+		eurekaServer.Stop()
+	})
+}
diff --git a/bootstrap/server.go b/bootstrap/server.go
index 417387a01..dd2e2e66f 100644
--- a/bootstrap/server.go
+++ b/bootstrap/server.go
@@ -372,9 +372,9 @@ func StopServers(servers []apiserver.Apiserver) {
 	for _, s := range servers {
 		wg.Add(1)
 		go func(s apiserver.Apiserver, wg *sync.WaitGroup) {
+			defer wg.Done()
 			log.Infof("start stop server protocol: %s", s.GetProtocol())
 			s.Stop()
-			wg.Done()
 			log.Infof("complete stop server protocol: %s", s.GetProtocol())
 		}(s, wg)
 	}