diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 53abb333732eeac7f53d33705de7fd70367a1902..57ed50fe7f8568be7f4408b292ee36a3d1a8ab4e 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -316,6 +316,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
 	if (!rec_dir_init || !clp->cl_firststate)
 		return;
 
+	clp->cl_firststate = 0;
 	nfs4_save_user(&uid, &gid);
 	status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
 	nfs4_reset_user(uid, gid);