diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index ca227e82ad8f..69e40a0a98fb 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -110,6 +110,7 @@ static int
 procfs_control(struct thread *td, struct proc *p, int op)
 {
 	int error = 0;
+	struct thread *temp;
 
 	/*
 	 * Attach - attaches the target process for debugging
@@ -212,10 +213,12 @@ out:
 		}
 
 		/* not being traced any more */
-		p->p_flag &= ~P_TRACED;
+		p->p_flag &= ~(P_TRACED | P_STOPPED_TRACE);
 
 		/* remove pending SIGTRAP, else the process will die */
 		sigqueue_delete_proc(p, SIGTRAP);
+		FOREACH_THREAD_IN_PROC(p, temp)
+			temp->td_dbgflags &= ~TDB_SUSPEND;
 		PROC_UNLOCK(p);
 
 		/* give process back to original parent */