diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 83118bd1d8..811c6e3342 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -609,6 +609,13 @@ void AppServer::DispatchMessage(int32 code, BPortLink &msg)
 					if(srvapp)
 					{
 						status_t		temp;
+						// TODO: This call never returns, thus screwing the
+						// app server completely: it's easy to test:
+						// run any test app which creates a window, quit
+						// the application clicking on the window's "close" button,
+						// and try to launch the application again. It won't start.
+						// Anyway, this should be moved to ~ServerApp() (which has already
+						// a "kill_thread()" call, btw).
 						wait_for_thread(srvapp_id, &temp);
 						delete srvapp;
 						srvapp= NULL;