diff --git a/server.go b/server.go
index a87ce932..23c4629e 100644
--- a/server.go
+++ b/server.go
@@ -798,7 +798,7 @@ func (s *Server) Stop() {
 func (s *Server) GracefulStop() {
 	s.mu.Lock()
 	if s.drain == true || s.conns == nil {
-		s.mu.Lock()
+		s.mu.Unlock()
 		return
 	}
 	s.drain = true
diff --git a/test/end2end_test.go b/test/end2end_test.go
index 0bbc3d90..a272a91c 100644
--- a/test/end2end_test.go
+++ b/test/end2end_test.go
@@ -553,6 +553,27 @@ func testTimeoutOnDeadServer(t *testing.T, e env) {
 	awaitNewConnLogOutput()
 }
 
+func TestServerGracefulStopIdempotent(t *testing.T) {
+	defer leakCheck(t)()
+	for _, e := range listTestEnv() {
+		if e.name == "handler-tls" {
+			continue
+		}
+		testServerGracefulStopIdempotent(t, e)
+	}
+}
+
+func testServerGracefulStopIdempotent(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.userAgent = testAppUA
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+
+	for i := 0; i < 3; i++ {
+		te.srv.GracefulStop()
+	}
+}
+
 func TestServerGoAway(t *testing.T) {
 	defer leakCheck(t)()
 	for _, e := range listTestEnv() {