diff --git a/client/control.go b/client/control.go
index c99bb1bc..f415f65f 100644
--- a/client/control.go
+++ b/client/control.go
@@ -140,8 +140,7 @@ func (ctl *Control) HandleReqWorkConn(inMsg *msg.ReqWorkConn) {
 	}
 
 	m := &msg.NewWorkConn{
-		RunId:     ctl.runId,
-		Timestamp: time.Now().Unix(),
+		RunId: ctl.runId,
 	}
 	if err = ctl.authSetter.SetNewWorkConn(m); err != nil {
 		xl.Warn("error during NewWorkConn authentication: %v", err)
@@ -298,9 +297,7 @@ func (ctl *Control) msgHandler() {
 		case <-hbSend.C:
 			// send heartbeat to server
 			xl.Debug("send heartbeat to server")
-			pingMsg := &msg.Ping{
-				Timestamp: time.Now().Unix(),
-			}
+			pingMsg := &msg.Ping{}
 			if err := ctl.authSetter.SetPing(pingMsg); err != nil {
 				xl.Warn("error during ping authentication: %v", err)
 				return
diff --git a/models/auth/token.go b/models/auth/token.go
index 6155a8d7..f7be085c 100644
--- a/models/auth/token.go
+++ b/models/auth/token.go
@@ -16,6 +16,7 @@ package auth
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/fatedier/frp/models/msg"
 	"github.com/fatedier/frp/utils/util"
@@ -74,6 +75,7 @@ func (auth *TokenAuthSetterVerifier) SetPing(pingMsg *msg.Ping) error {
 		return nil
 	}
 
+	pingMsg.Timestamp = time.Now().Unix()
 	pingMsg.PrivilegeKey = util.GetAuthKey(auth.token, pingMsg.Timestamp)
 	return nil
 }
@@ -83,6 +85,7 @@ func (auth *TokenAuthSetterVerifier) SetNewWorkConn(newWorkConnMsg *msg.NewWorkC
 		return nil
 	}
 
+	newWorkConnMsg.Timestamp = time.Now().Unix()
 	newWorkConnMsg.PrivilegeKey = util.GetAuthKey(auth.token, newWorkConnMsg.Timestamp)
 	return nil
 }