diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 5fd3aa934c0..39c6028e2d3 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1036,6 +1036,7 @@ pmap_new_thread(struct thread *td)
 			panic("pmap_new_thread: kstack allocation failed");
 		td->td_kstack = ks;
 	}
+	ptek = vtopte(ks);
 #endif
 	for (i = 0; i < KSTACK_PAGES; i++) {
 		/*
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 5fd3aa934c0..39c6028e2d3 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1036,6 +1036,7 @@ pmap_new_thread(struct thread *td)
 			panic("pmap_new_thread: kstack allocation failed");
 		td->td_kstack = ks;
 	}
+	ptek = vtopte(ks);
 #endif
 	for (i = 0; i < KSTACK_PAGES; i++) {
 		/*