diff --git a/replication.go b/replication.go
index a44f618..8821b77 100644
--- a/replication.go
+++ b/replication.go
@@ -525,7 +525,7 @@ func (s *Server) standbySession(primaryAddr string) error {
 		default:
 		}
 
-		conn.SetReadDeadline(time.Now().Add(45 * time.Second)) //nolint:errcheck
+		conn.SetReadDeadline(time.Now().Add(30 * time.Second)) //nolint:errcheck
 		msg, err := readMessage(conn)
 		if err != nil {
 			if err == io.EOF {
diff --git a/replication/replication.go b/replication/replication.go
index 755b190..74271f9 100644
--- a/replication/replication.go
+++ b/replication/replication.go
@@ -145,7 +145,7 @@ func (m *Manager) PushDelta(entries []walpkg.DeltaEntry, seqNo uint64) {
 // subscribers so standbys can detect primary failure within ~30s.
 // It blocks until done is closed.
 func (m *Manager) StartHeartbeat(done <-chan struct{}) {
-	ticker := time.NewTicker(15 * time.Second)
+	ticker := time.NewTicker(10 * time.Second)
 	defer ticker.Stop()
 	for {
 		select {