diff --git a/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java b/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java
index 179f06e4b..f0241ac02 100644
--- a/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java
+++ b/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java
@@ -323,16 +323,18 @@ public void registerOperation(AbstractOperation operation) {
 //        boolean blockNeeded = checkIfBlockingNeeded(operation.getApiID());
 //        securityMetaData.getMetaData().setApiBlocked(blockNeeded);
                 HttpRequest request = securityMetaData.getRequest();
-//                if (StringUtils.isEmpty(request.getRoute())){
                 Framework frameWork = Framework.UNKNOWN;
                 if(!securityMetaData.getFuzzRequestIdentifier().getK2Request() && StringUtils.isNotBlank(securityMetaData.getMetaData().getFramework())) {
                     frameWork = Framework.valueOf(securityMetaData.getMetaData().getFramework());
                 }
                 if (!securityMetaData.getFuzzRequestIdentifier().getK2Request() && StringUtils.isEmpty(request.getRoute())){
-                    request.setRoute(getEndpointRoute(StringUtils.substringBefore(request.getUrl(), "?"), frameWork), true);
-                    logger.log(LogLevel.FINEST,"Route detection using Application Endpoint", this.getClass().getName());
+                    String route = getEndpointRoute(StringUtils.substringBefore(request.getUrl(), "?"), frameWork);
+                    if (route != null) {
+                        request.setRoute(route);
+                        logger.log(LogLevel.FINEST,"Route detection using Application Endpoint", this.getClass().getName());
+                    }
                 }
-//                }
+
                 if (needToGenerateEvent(operation.getApiID())) {
                     DispatcherPool.getInstance().dispatchEvent(operation, securityMetaData);
                     if (!firstEventProcessed.get()) {
@@ -358,7 +360,7 @@ private String getEndpointRoute(String uri, Framework framework){
     private String getEndpointRoute(String uri) {
         List<String> uriSegments = URLMappingsHelper.getSegments(uri);
         if (uriSegments.isEmpty()){
-            return StringUtils.EMPTY;
+            return null;
         }
         for (RouteSegments routeSegments : URLMappingsHelper.getRouteSegments()) {
             int uriSegIdx = 0;
@@ -384,7 +386,7 @@ private String getEndpointRoute(String uri) {
                 }
             }
         }
-        return StringUtils.EMPTY;
+        return null;
     }
 
     private int jumpRoute(List<RouteSegment> value, int i1, List<String> uriSegments, int i) {