diff --git a/features/policy/policy.go b/features/policy/policy.go
index 5d581fe2..984b32f4 100644
--- a/features/policy/policy.go
+++ b/features/policy/policy.go
@@ -113,7 +113,9 @@ func defaultBufferPolicy() Buffer {
 func SessionDefault() Session {
 	return Session{
 		Timeouts: Timeout{
-			Handshake:      time.Second * 4,
+			//Align Handshake timeout with nginx client_header_timeout
+			//So that this value will not indicate server identity
+			Handshake:      time.Second * 60,
 			ConnectionIdle: time.Second * 300,
 			UplinkOnly:     time.Second * 1,
 			DownlinkOnly:   time.Second * 1,