diff --git a/src/Runner.Common/BrokerServer.cs b/src/Runner.Common/BrokerServer.cs
index 891f0c359..dd203a39d 100644
--- a/src/Runner.Common/BrokerServer.cs
+++ b/src/Runner.Common/BrokerServer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using GitHub.DistributedTask.WebApi;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Common.Util;
@@ -15,7 +16,7 @@ namespace GitHub.Runner.Common
     public interface IBrokerServer : IRunnerService
     {
         Task ConnectAsync(Uri serverUrl, CancellationToken cancellationToken);
-        Task<string> GetMessageAsync(int poolId, Guid sessionId, long? lastMessageId, CancellationToken cancellationToken);
+        Task<string> GetMessageAsync(TaskAgentSession session, RunnerSettings settings, long? lastMessageId, CancellationToken cancellationToken);
     }
 
     public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -30,9 +31,9 @@ namespace GitHub.Runner.Common
             await _httpClient.GetAsync("health", cancellationToken);
         }
 
-        public async Task<string> GetMessageAsync(int poolId, Guid sessionId, long? lastMessageId, CancellationToken cancellationToken)
+        public async Task<string> GetMessageAsync(TaskAgentSession session, RunnerSettings settings, long? lastMessageId, CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("message", cancellationToken);
+            var response = await _httpClient.GetAsync($"message?tenant=org:github&root_tenant=org:github&group_id={settings.PoolId}&group_name={settings.PoolName}&runner_id={settings.AgentId}&runner_name={settings.AgentName}&labels=self-hosted,linux", cancellationToken);
             if (!response.IsSuccessStatusCode)
             {
                 var content = default(string);
diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs
index 9dbd2c5fa..3c90e4d73 100644
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -225,7 +225,7 @@ namespace GitHub.Runner.Listener
                 string message = null;
                 try
                 {
-                    message = await _brokerServer.GetMessageAsync(_settings.PoolId, _session.SessionId, null/*_lastMessageId*/, token);
+                    message = await _brokerServer.GetMessageAsync(_session, _settings, null/*_lastMessageId*/, token);
 
                     _term.WriteLine($"{DateTime.UtcNow:u}: {message}");
                     if (message != null)