diff --git a/core/thread/thread_pool.odin b/core/thread/thread_pool.odin
index af80da9aa..840cecfec 100644
--- a/core/thread/thread_pool.odin
+++ b/core/thread/thread_pool.odin
@@ -39,6 +39,7 @@ Pool :: struct {
 
 	threads: []^Thread,
 
+
 	tasks:      [dynamic]Task,
 	tasks_done: [dynamic]Task,
 }
@@ -102,8 +103,19 @@ pool_join :: proc(pool: ^Pool) {
 
 	yield()
 
-	for t in pool.threads {
-		join(t)
+	// Because we already stopped the pool, there's no need to take a lock here.
+
+	started_count: int
+	for started_count < len(pool.threads) {
+		started_count = 0
+		for t in pool.threads {
+			if .Started in t.flags {
+				started_count += 1
+			}
+			if .Joined not_in t.flags {
+				join(t)
+			}
+		}
 	}
 }