diff --git a/internal/distributed/querynode/client/client.go b/internal/distributed/querynode/client/client.go
index ee24b2e995..9cabe4e337 100644
--- a/internal/distributed/querynode/client/client.go
+++ b/internal/distributed/querynode/client/client.go
@@ -127,7 +127,11 @@ func (c *Client) Start() error {
 }
 
 func (c *Client) Stop() error {
-	return c.conn.Close()
+	c.cancel()
+	if c.conn != nil {
+		c.conn.Close()
+	}
+	return nil
 }
 
 // Register dummy
diff --git a/internal/distributed/querynode/client/client_test.go b/internal/distributed/querynode/client/client_test.go
new file mode 100644
index 0000000000..a1a526bc77
--- /dev/null
+++ b/internal/distributed/querynode/client/client_test.go
@@ -0,0 +1,15 @@
+package grpcquerynodeclient
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNilClient(t *testing.T) {
+	client, err := NewClient(context.Background(), "test")
+	assert.Nil(t, err)
+	err = client.Stop()
+	assert.Nil(t, err)
+}