diff --git a/internal/querynode/tsafe.go b/internal/querynode/tsafe.go
index 27513ba67a..47f5b9dc3d 100644
--- a/internal/querynode/tsafe.go
+++ b/internal/querynode/tsafe.go
@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/milvus-io/milvus/internal/log"
+	"github.com/milvus-io/milvus/internal/util/typeutil"
 )
 
 type tSafeWatcher struct {
@@ -85,7 +86,7 @@ func newTSafe(ctx context.Context, channel Channel) tSafer {
 		watcherList: make([]*tSafeWatcher, 0),
 		tSafeChan:   make(chan tSafeMsg, channelSize),
 		tSafeRecord: make(map[UniqueID]Timestamp),
-		tSafe:       math.MaxUint64,
+		tSafe:       typeutil.ZeroTimestamp,
 	}
 	return t
 }
diff --git a/internal/querynode/tsafe_replica.go b/internal/querynode/tsafe_replica.go
index a7ca151c7a..50cd5f89dd 100644
--- a/internal/querynode/tsafe_replica.go
+++ b/internal/querynode/tsafe_replica.go
@@ -146,8 +146,7 @@ func (t *tSafeReplica) registerTSafeWatcher(vChannel Channel, watcher *tSafeWatc
 	if err != nil {
 		return err
 	}
-	safer.registerTSafeWatcher(watcher)
-	return nil
+	return safer.registerTSafeWatcher(watcher)
 }
 
 func newTSafeReplica() TSafeReplicaInterface {