diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index f81127be70ad..5d3f61b1eb47 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -134,12 +134,12 @@ do { \
 		m_freem(mrep); \
 		mrep = NULL; \
 	} \
+	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
+	*mrq = mreq; \
 	if (error == EBADRPC) { \
 		error = 0; \
 		goto nfsmout; \
 	} \
-	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
-	*mrq = mreq; \
 } while (0)
 
 #define	nfsm_writereply(s) \