@@ -961,6 +961,7 @@ void
 mono_domain_unset (void)
 {
 	SET_APPDOMAIN (NULL);
+	SET_APPCONTEXT(NULL);
 }
 
 void
 
@@ -1080,8 +1080,8 @@ mono_thread_detach_internal (MonoInternalThread *thread)
 	/* There is no more any guarantee that `thread` is alive */
 	mono_memory_barrier ();
 
+	mono_domain_unset();
 	SET_CURRENT_OBJECT (NULL);
-	mono_domain_unset ();
 
 	if (!mono_thread_info_try_get_internal_thread_gchandle (info, &gchandle))
 		g_error ("%s: failed to get gchandle, info = %p", __func__, info);
Original file line number	Diff line number	Diff line change
`@@ -961,6 +961,7 @@ void`
`961`	`961`	`mono_domain_unset (void)`
`962`	`962`	`{`
`963`	`963`	`SET_APPDOMAIN (NULL);`
	`964`	`+ SET_APPCONTEXT(NULL);`
`964`	`965`	`}`
`965`	`966`
`966`	`967`	`void`