diff --git a/src/kits/app/Messenger.cpp b/src/kits/app/Messenger.cpp
index dc46576dc3..c9ce8ba8b9 100644
--- a/src/kits/app/Messenger.cpp
+++ b/src/kits/app/Messenger.cpp
@@ -184,7 +184,9 @@ BHandler *
 BMessenger::Target(BLooper** _looper) const
 {
 	BHandler *handler = NULL;
-	if (IsTargetLocal() && fHandlerToken > B_NULL_TOKEN) {
+	if (IsTargetLocal() 
+		&& (fHandlerToken > B_NULL_TOKEN
+			|| fHandlerToken == B_PREFERRED_TOKEN)) {
 		gDefaultTokens.GetToken(fHandlerToken, B_HANDLER_TOKEN,
 			(void**)&handler);
 		if (_looper)