diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 51cb36eaec..a5e256be19 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -161,8 +161,8 @@ namespace OpenSim.Framework.Servers
                     {
                         m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent);
                         HandleAgentRequest(agentHandler, request, response);
+                        return;
                     }
-                    return;
                 }
 
                 IRequestHandler requestHandler;