diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 3882c338c6..6f8a20bf1d 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -142,9 +142,7 @@ protected Builder() {
          *
          * @param pingBeforeActivateConnection true/false
          * @return {@code this}
-         * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
          */
-        @Deprecated
         public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
             this.pingBeforeActivateConnection = pingBeforeActivateConnection;
             return this;
@@ -335,7 +333,7 @@ public ClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getConfiguredProtocolVersion()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
                 .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
@@ -349,9 +347,7 @@ public ClientOptions.Builder mutate() {
      * unless forcing to use the RESP 2 protocol version.
      *
      * @return {@literal true} if {@literal PING} barrier is enabled.
-     * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
      */
-    @Deprecated
     public boolean isPingBeforeActivateConnection() {
         return pingBeforeActivateConnection;
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index a87c4aec56..1c42cc0d5f 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -177,6 +177,12 @@ public Builder topologyRefreshOptions(ClusterTopologyRefreshOptions topologyRefr
             return this;
         }
 
+        @Override
+        public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
+            super.pingBeforeActivateConnection(pingBeforeActivateConnection);
+            return this;
+        }
+
         @Override
         public Builder protocolVersion(ProtocolVersion protocolVersion) {
             super.protocolVersion(protocolVersion);
@@ -269,8 +275,8 @@ public ClusterClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
-                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
+                .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
                 .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
                 .topologyRefreshOptions(getTopologyRefreshOptions());