diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/BlockingLightWalletClientImpl.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/BlockingLightWalletClientImpl.kt
index 3613dfd3..bc20a10e 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/BlockingLightWalletClientImpl.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/BlockingLightWalletClientImpl.kt
@@ -154,9 +154,9 @@ internal class BlockingLightWalletClientImpl private constructor(
         channel = channelFactory.newChannel(lightWalletEndpoint)
     }
 
-    // test code
-    internal var stateCount = 0
-    internal var state: ConnectivityState? = null
+    // These make the implementation of BlockingLightWalletClientImpl not thread-safe.
+    private var stateCount = 0
+    private var state: ConnectivityState? = null
     private fun requireChannel(): ManagedChannel {
         state = channel.getState(false).let { new ->
             if (state == new) stateCount++ else stateCount = 0
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/CoroutineLightWalletClientImpl.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/CoroutineLightWalletClientImpl.kt
index 6551a1d7..fd32c16d 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/CoroutineLightWalletClientImpl.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/CoroutineLightWalletClientImpl.kt
@@ -154,9 +154,10 @@ internal class CoroutineLightWalletClientImpl private constructor(
         channel = channelFactory.newChannel(lightWalletEndpoint)
     }
 
-    // test code
-    internal var stateCount = 0
-    internal var state: ConnectivityState? = null
+    // These make the CoroutineLightWalletClientImpl not thread safe. In the long-term, we should
+    // consider making it thread safe.
+    private var stateCount = 0
+    private var state: ConnectivityState? = null
     private fun requireChannel(): ManagedChannel {
         state = channel.getState(false).let { new ->
             if (state == new) stateCount++ else stateCount = 0