diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index eac0267ce1b..d5fd2315666 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -875,6 +875,9 @@ fork_exit(callout, arg, frame)
 		kthread_exit(0);
 	}
 	PROC_UNLOCK(p);
+#ifdef DIAGNOSTIC
+	cred_free_thread(td);
+#endif
 	mtx_assert(&Giant, MA_NOTOWNED);
 }
 
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 3ddd2862d64..8f8580385fd 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1765,6 +1765,19 @@ crdup(struct ucred *cr)
 	return (newcr);
 }
 
+#ifdef DIAGNOSTIC
+void
+cred_free_thread(struct thread *td)
+{
+	struct ucred *cred;
+
+	cred = td->td_ucred;
+	td->td_ucred = NULL;
+	if (cred != NULL)
+		crfree(cred);
+}
+#endif
+
 /*
  * Fill in a struct xucred based on a struct ucred.
  */
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 85edeedb807..951283a8f62 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -236,5 +236,8 @@ ast(struct trapframe *framep)
 	}
 
 	userret(td, framep, sticks);
+#ifdef DIAGNOSTIC
+	cred_free_thread(td);
+#endif
 	mtx_assert(&Giant, MA_NOTOWNED);
 }