diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 0984564c84..c3f50b22dd 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -2690,8 +2690,8 @@ ServerWindow::SendMessageToClient(const BMessage* msg, int32 target) const
 
 	BMessenger reply;
 	BMessage::Private messagePrivate((BMessage *)msg);
-	return messagePrivate.SendMessage(fClientLooperPort, target, 0,
-		false, reply);
+	return messagePrivate.SendMessage(fClientLooperPort, fClientTeam, target,
+		0, false, reply);
 }
 
 
diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index f109f83df0..02d506d487 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -1744,7 +1744,7 @@ InputServer::_DispatchEvent(BMessage* event)
 #if defined(HAIKU_TARGET_PLATFORM_HAIKU)
 	BMessenger reply;
 	BMessage::Private messagePrivate(event);
-	return messagePrivate.SendMessage(fAppServerPort, 0, true, 0, reply);
+	return messagePrivate.SendMessage(fAppServerPort, -1, 0, true, 0, reply);
 #else
 	ssize_t length = event->FlattenedSize();
 	char buffer[length];