--- sys/fs/nfsclient/nfs_clstate.c.slot	2022-05-23 13:38:55.729677000 -0700
+++ sys/fs/nfsclient/nfs_clstate.c	2022-05-23 13:39:34.794899000 -0700
@@ -2765,8 +2765,7 @@ nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *
 			error = nfsrpc_renew(clp, NULL, cred, p);
 			if (error == NFSERR_CBPATHDOWN)
 			    cbpathdown = 1;
-			else if (error == NFSERR_STALECLIENTID ||
-			    error == NFSERR_BADSESSION) {
+			else if (error == NFSERR_STALECLIENTID) {
 			    NFSLOCKCLSTATE();
 			    clp->nfsc_flags |= NFSCLFLAGS_RECOVER;
 			    NFSUNLOCKCLSTATE();
--- sys/fs/nfsclient/nfs_clrpcops.c.slot	2022-05-23 13:40:27.480417000 -0700
+++ sys/fs/nfsclient/nfs_clrpcops.c	2022-05-23 13:44:23.532820000 -0700
@@ -1062,8 +1062,12 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclcli
 			 * in-progress RPCs.
 			 */
 			tsep = NULL;
-			if (TAILQ_FIRST(&nmp->nm_sess) != NULL)
+			if (TAILQ_FIRST(&nmp->nm_sess) != NULL) {
 				tsep = NFSMNT_MDSSESSION(nmp);
+				if (tsep->nfsess_defunct == 0)
+					printf("nfsrpc_setclient: "
+					    "nfsess_defunct not set\n");
+			}
 			TAILQ_INSERT_HEAD(&nmp->nm_sess, dsp,
 			    nfsclds_list);
 			/*