diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
index f2118c8..d3dcedb 100644
--- a/daemon/nfs41_compound.c
+++ b/daemon/nfs41_compound.c
@@ -372,6 +372,13 @@ retry:
             status = ERROR_BAD_NET_RESP;
             goto out;
         }
+        if (compound->args.argarray[0].op == OP_CREATE_SESSION) {
+            nfs41_create_session_args *csa = (nfs41_create_session_args*)
+                compound->args.argarray[0].arg;
+            AcquireSRWLockShared(&session->client->exid_lock);
+            csa->csa_clientid = session->client->clnt_id;
+            AcquireSRWLockShared(&session->client->exid_lock);
+        }
         goto do_retry;
 
     case NFS4ERR_BADSESSION: