diff --git a/.vscode/launch.json b/.vscode/launch.json
index 887789e3b..3c5f5c694 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,10 +12,7 @@
             ],
             "cwd": "${workspaceFolder}/src",
             "console": "integratedTerminal",
-            "requireExactSource": false,
-            "env": {
-                "USE_BROKER_FLOW": "1"
-            }
+            "requireExactSource": false
         },
         {
             "name": "Run",
@@ -27,10 +24,7 @@
             ],
             "cwd": "${workspaceFolder}/src",
             "console": "integratedTerminal",
-            "requireExactSource": false,
-            "env": {
-                "USE_BROKER_FLOW": "1"
-            }
+            "requireExactSource": false
         },
         {
             "name": "Configure",
@@ -60,4 +54,5 @@
             "requireExactSource": false
         },
     ],
-}
\ No newline at end of file
+}
+
diff --git a/src/Runner.Listener/BrokerMessageListener.cs b/src/Runner.Listener/BrokerMessageListener.cs
index 303244491..c0c7516b8 100644
--- a/src/Runner.Listener/BrokerMessageListener.cs
+++ b/src/Runner.Listener/BrokerMessageListener.cs
@@ -25,7 +25,6 @@ namespace GitHub.Runner.Listener
         private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
         private CancellationTokenSource _getMessagesTokenSource;
         private IBrokerServer _brokerServer;
-        private string lastRunnerRequestId;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -80,20 +79,7 @@ namespace GitHub.Runner.Listener
                         continue;
                     }
 
-                    if (MessageUtil.IsRunServiceJob(message.MessageType))
-                    {
-                        var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-
-                        if (messageRef.RunnerRequestId != lastRunnerRequestId)
-                        {
-                            lastRunnerRequestId = messageRef.RunnerRequestId;
-                            return message;
-                        }
-                    }
-                    else
-                    {
-                        return message;
-                    }
+                    return message;
                 }
                 catch (OperationCanceledException) when (_getMessagesTokenSource.Token.IsCancellationRequested && !token.IsCancellationRequested)
                 {