diff --git a/pl/threads.yap b/pl/threads.yap
index 41a9a06e5..3be006e42 100644
--- a/pl/threads.yap
+++ b/pl/threads.yap
@@ -193,7 +193,10 @@ thread_create(Goal, OutId, Options) :-
 '$record_thread_info'(Id, Sizes, Detached, AtExit) :-
 	recorda('$thread_sizes', [Id|Sizes], _),
 	recorda('$thread_detached', [Id|Detached], _),
-	recorda('$thread_at_exit', [Id|AtExit], _).
+	(	AtExit == true ->
+		true
+	;	recorda('$thread_at_exit', [Id|AtExit], _)
+	).
 
 % vsc: ?????
 thread_defaults(Defaults) :-