diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
index 0967e99edc..a6542d1451 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
@@ -89,12 +89,7 @@ class ReconnectingCordaRPCOps private constructor(
      *
      * Note that this method does not guarantee 100% that the flow will not be started twice.
      */
-    fun runFlowWithLogicalRetry(
-            runFlow: (CordaRPCOps) -> StateMachineRunId,
-            hasFlowStarted: (CordaRPCOps) -> Boolean,
-            onFlowConfirmed: () -> Unit = {},
-            timeout: Duration = 4.seconds
-    ) {
+    fun runFlowWithLogicalRetry(runFlow: (CordaRPCOps) -> StateMachineRunId, hasFlowStarted: (CordaRPCOps) -> Boolean, onFlowConfirmed: () -> Unit = {}, timeout: Duration = 4.seconds) {
         try {
             runFlow(this)
             onFlowConfirmed()
@@ -254,40 +249,39 @@ class ReconnectingCordaRPCOps private constructor(
             }
         }
 
-        private tailrec fun doInvoke(method: Method, args: Array<out Any>?): Any? {
-            // will stop recursing when [method.invoke] succeeds
-            try {
-                log.debug { "Invoking RPC $method..." }
-                return method.invoke(reconnectingRPCConnection.proxy, *(args ?: emptyArray())).also {
-                    log.debug { "RPC $method invoked successfully." }
-                }
-            } catch (e: InvocationTargetException) {
-                when (e.targetException) {
-                    is RejectedCommandException -> {
-                        log.error("Node is being shutdown. Operation ${method.name} rejected. Retrying when node is up...", e)
-                        reconnectingRPCConnection.reconnectOnError(e)
+        private fun doInvoke(method: Method, args: Array<out Any>?): Any? {
+            // will stop looping when [method.invoke] succeeds
+            while (true) {
+                try {
+                    log.debug { "Invoking RPC $method..." }
+                    return method.invoke(reconnectingRPCConnection.proxy, *(args ?: emptyArray())).also {
+                        log.debug { "RPC $method invoked successfully." }
                     }
-                    is ConnectionFailureException -> {
-                        if (!reconnectingRPCConnection.proxy.isWaitingForShutdown()) {
-                            log.error("Failed to perform operation ${method.name}. Connection dropped. Retrying....", e)
+                } catch (e: InvocationTargetException) {
+                    when (e.targetException) {
+                        is RejectedCommandException -> {
+                            log.error("Node is being shutdown. Operation ${method.name} rejected. Retrying when node is up...", e)
                             reconnectingRPCConnection.reconnectOnError(e)
                         }
-                        checkIfIsStartFlow(method, e)
-                    }
-                    is RPCException -> {
-                        log.error("Failed to perform operation ${method.name}. RPCException. Retrying....", e)
-                        reconnectingRPCConnection.reconnectOnError(e)
-                        Thread.sleep(1000) // TODO - explain why this sleep is necessary
-                        checkIfIsStartFlow(method, e)
-                    }
-                    else -> {
-                        log.error("Failed to perform operation ${method.name}. Unknown error. Retrying....", e)
-                        reconnectingRPCConnection.reconnectOnError(e)
-                        checkIfIsStartFlow(method, e)
+                        is ConnectionFailureException -> {
+                            log.error("Failed to perform operation ${method.name}. Connection dropped. Retrying....", e)
+                            reconnectingRPCConnection.reconnectOnError(e)
+                            checkIfIsStartFlow(method, e)
+                        }
+                        is RPCException -> {
+                            log.error("Failed to perform operation ${method.name}. RPCException. Retrying....", e)
+                            reconnectingRPCConnection.reconnectOnError(e)
+                            Thread.sleep(1000) // TODO - explain why this sleep is necessary
+                            checkIfIsStartFlow(method, e)
+                        }
+                        else -> {
+                            log.error("Failed to perform operation ${method.name}. Unknown error. Retrying....", e)
+                            reconnectingRPCConnection.reconnectOnError(e)
+                            checkIfIsStartFlow(method, e)
+                        }
                     }
                 }
             }
-            return doInvoke(method, args)
         }
 
         override fun invoke(proxy: Any, method: Method, args: Array<out Any>?): Any? {