diff --git a/.ci/api-current.txt b/.ci/api-current.txt
index 8ab620f5f2..7299359297 100644
--- a/.ci/api-current.txt
+++ b/.ci/api-current.txt
@@ -6527,7 +6527,7 @@ public static final class net.corda.client.rpc.CordaRPCClient$Companion extends
   @NotNull
   public final net.corda.client.rpc.CordaRPCClient createWithSsl(net.corda.core.utilities.NetworkHostAndPort, net.corda.core.messaging.ClientRpcSslOptions, net.corda.client.rpc.CordaRPCClientConfiguration)
 ##
-public final class net.corda.client.rpc.CordaRPCClientConfiguration extends java.lang.Object
+public class net.corda.client.rpc.CordaRPCClientConfiguration extends java.lang.Object
   public <init>(java.time.Duration)
   @NotNull
   public final java.time.Duration component1()
@@ -6535,8 +6535,9 @@ public final class net.corda.client.rpc.CordaRPCClientConfiguration extends java
   public final net.corda.client.rpc.CordaRPCClientConfiguration copy(java.time.Duration)
   public boolean equals(Object)
   @NotNull
-  public final java.time.Duration getConnectionMaxRetryInterval()
+  public java.time.Duration getConnectionMaxRetryInterval()
   public int hashCode()
+  @NotNull
   public String toString()
   public static final net.corda.client.rpc.CordaRPCClientConfiguration$Companion Companion
   @NotNull
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
index 4892a4e94b..968620cef9 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
@@ -28,6 +28,11 @@ class CordaRPCConnection internal constructor(connection: RPCConnection<CordaRPC
  */
 open class CordaRPCClientConfiguration @JvmOverloads constructor(
 
+        /**
+         * Maximum retry interval.
+         */
+        open val connectionMaxRetryInterval: Duration = 3.minutes,
+
         /**
          * The minimum protocol version required from the server.
          */
@@ -69,11 +74,6 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
          */
         open val connectionRetryIntervalMultiplier: Double = 1.5,
 
-        /**
-         * Maximum retry interval.
-         */
-        open val connectionMaxRetryInterval: Duration = 3.minutes,
-
         /**
          * Maximum reconnect attempts on failover>
          */
@@ -107,6 +107,7 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
      */
     @JvmOverloads
     fun copy(
+            connectionMaxRetryInterval: Duration = this.connectionMaxRetryInterval,
             minimumServerProtocolVersion: Int = this.minimumServerProtocolVersion,
             trackRpcCallSites: Boolean = this.trackRpcCallSites,
             reapInterval: Duration = this.reapInterval,
@@ -114,12 +115,12 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
             cacheConcurrencyLevel: Int = this.cacheConcurrencyLevel,
             connectionRetryInterval: Duration = this.connectionRetryInterval,
             connectionRetryIntervalMultiplier: Double = this.connectionRetryIntervalMultiplier,
-            connectionMaxRetryInterval: Duration = this.connectionMaxRetryInterval,
             maxReconnectAttempts: Int = this.maxReconnectAttempts,
             maxFileSize: Int = this.maxFileSize,
             deduplicationCacheExpiry: Duration = this.deduplicationCacheExpiry
     ): CordaRPCClientConfiguration {
         return CordaRPCClientConfiguration(
+                connectionMaxRetryInterval,
                 minimumServerProtocolVersion,
                 trackRpcCallSites,
                 reapInterval,
@@ -127,7 +128,6 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
                 cacheConcurrencyLevel,
                 connectionRetryInterval,
                 connectionRetryIntervalMultiplier,
-                connectionMaxRetryInterval,
                 maxReconnectAttempts,
                 maxFileSize,
                 deduplicationCacheExpiry
@@ -139,6 +139,7 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
         if (javaClass != other?.javaClass) return false
 
         other as CordaRPCClientConfiguration
+        if (connectionMaxRetryInterval != other.connectionMaxRetryInterval) return false
         if (minimumServerProtocolVersion != other.minimumServerProtocolVersion) return false
         if (trackRpcCallSites != other.trackRpcCallSites) return false
         if (reapInterval != other.reapInterval) return false
@@ -146,7 +147,6 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
         if (cacheConcurrencyLevel != other.cacheConcurrencyLevel) return false
         if (connectionRetryInterval != other.connectionRetryInterval) return false
         if (connectionRetryIntervalMultiplier != other.connectionRetryIntervalMultiplier) return false
-        if (connectionMaxRetryInterval != other.connectionMaxRetryInterval) return false
         if (maxReconnectAttempts != other.maxReconnectAttempts) return false
         if (maxFileSize != other.maxFileSize) return false
         if (deduplicationCacheExpiry != other.deduplicationCacheExpiry) return false
@@ -156,13 +156,13 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
 
     override fun hashCode(): Int {
         var result = minimumServerProtocolVersion
+        result = 31 * result + connectionMaxRetryInterval.hashCode()
         result = 31 * result + trackRpcCallSites.hashCode()
         result = 31 * result + reapInterval.hashCode()
         result = 31 * result + observationExecutorPoolSize
         result = 31 * result + cacheConcurrencyLevel
         result = 31 * result + connectionRetryInterval.hashCode()
         result = 31 * result + connectionRetryIntervalMultiplier.hashCode()
-        result = 31 * result + connectionMaxRetryInterval.hashCode()
         result = 31 * result + maxReconnectAttempts
         result = 31 * result + maxFileSize
         result = 31 * result + deduplicationCacheExpiry.hashCode()
@@ -171,14 +171,18 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor(
 
     override fun toString(): String {
         return "CordaRPCClientConfiguration(" +
+                "connectionMaxRetryInterval=$connectionMaxRetryInterval, " +
                 "minimumServerProtocolVersion=$minimumServerProtocolVersion, trackRpcCallSites=$trackRpcCallSites, " +
                 "reapInterval=$reapInterval, observationExecutorPoolSize=$observationExecutorPoolSize, " +
                 "cacheConcurrencyLevel=$cacheConcurrencyLevel, connectionRetryInterval=$connectionRetryInterval, " +
                 "connectionRetryIntervalMultiplier=$connectionRetryIntervalMultiplier, " +
-                "connectionMaxRetryInterval=$connectionMaxRetryInterval, maxReconnectAttempts=$maxReconnectAttempts, " +
-                "maxFileSize=$maxFileSize, deduplicationCacheExpiry=$deduplicationCacheExpiry)"
+                "maxReconnectAttempts=$maxReconnectAttempts, maxFileSize=$maxFileSize, " +
+                "deduplicationCacheExpiry=$deduplicationCacheExpiry)"
     }
 
+    // Left is for backwards compatibility with version 3.1
+    operator fun component1() = connectionMaxRetryInterval
+
 }
 
 /**