diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 69e40a0a98fb..5980ce179ece 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -236,7 +236,6 @@ procfs_control(struct thread *td, struct proc *p, int op)
 			PROC_LOCK(p);
 		p->p_oppid = 0;
 		p->p_flag &= ~P_WAITED;	/* XXX ? */
-		PROC_UNLOCK(p);
 		sx_xunlock(&proctree_lock);
 
 		wakeup(td->td_proc);	/* XXX for CTL_WAIT below ? */
@@ -249,9 +248,10 @@ procfs_control(struct thread *td, struct proc *p, int op)
 	 */
 	case PROCFS_CTL_STEP:
 		error = proc_sstep(FIRST_THREAD_IN_PROC(p));
-		PROC_UNLOCK(p);
-		if (error)
+		if (error) {
+			PROC_UNLOCK(p);
 			return (error);
+		}
 		break;
 
 	/*
@@ -260,7 +260,6 @@ procfs_control(struct thread *td, struct proc *p, int op)
 	 */
 	case PROCFS_CTL_RUN:
 		p->p_flag &= ~P_STOPPED_SIG;	/* this uses SIGSTOP */
-		PROC_UNLOCK(p);
 		break;
 
 	/*
@@ -292,6 +291,7 @@ procfs_control(struct thread *td, struct proc *p, int op)
 	PROC_SLOCK(p);
 	thread_unsuspend(p); /* If it can run, let it do so. */
 	PROC_SUNLOCK(p);
+	PROC_UNLOCK(p);
 	return (0);
 }