diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
index 607e25d..390cde3 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
@@ -37,18 +37,17 @@
     private final String clusterName;
     private final MessagingService messagingService;
     private final CopycatTransport.Mode mode;
-    private final ThreadContext context;
     private final Set<CopycatTransportConnection> connections = Sets.newConcurrentHashSet();
 
     CopycatTransportClient(String clusterName, MessagingService messagingService, CopycatTransport.Mode mode) {
         this.clusterName = checkNotNull(clusterName);
         this.messagingService = checkNotNull(messagingService);
         this.mode = checkNotNull(mode);
-        this.context = ThreadContext.currentContextOrThrow();
     }
 
     @Override
     public CompletableFuture<Connection> connect(Address remoteAddress) {
+        ThreadContext context = ThreadContext.currentContextOrThrow();
         CopycatTransportConnection connection = new CopycatTransportConnection(
                 nextConnectionId(),
                 CopycatTransport.Mode.CLIENT,