diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -316,19 +316,17 @@
 	if (flags & TDF_NEEDSIGCHK || p->p_pendingcnt > 0 ||
 	    !SIGISEMPTY(p->p_siglist)) {
 		sigfastblock_fetch(td);
+		PROC_LOCK(p);
+		mtx_lock(&p->p_sigacts->ps_mtx);
+		while ((sig = cursig(td)) != 0) {
+			KASSERT(sig >= 0, ("sig %d", sig));
+			postsig(sig);
+		}
+		mtx_unlock(&p->p_sigacts->ps_mtx);
+		PROC_UNLOCK(p);
 		if ((td->td_pflags & TDP_SIGFASTBLOCK) != 0 &&
-		    td->td_sigblock_val != 0) {
+		    td->td_sigblock_val != 0)
 			sigfastblock_setpend(td, true);
-		} else {
-			PROC_LOCK(p);
-			mtx_lock(&p->p_sigacts->ps_mtx);
-			while ((sig = cursig(td)) != 0) {
-				KASSERT(sig >= 0, ("sig %d", sig));
-				postsig(sig);
-			}
-			mtx_unlock(&p->p_sigacts->ps_mtx);
-			PROC_UNLOCK(p);
-		}
 	}
 
 	/*