diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
index 74a3f312a..4a98e4b9c 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
@@ -83,15 +83,15 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
 		}
 		String path = (String) request
 				.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+		if (path == null) {
+			return handler;
+		}
 		if (StringUtils.hasText(prefix) && !path.startsWith(prefix)) {
 			return null;
 		}
 		if (path.startsWith(prefix)) {
 			path = path.substring(prefix.length());
 		}
-		if (path == null) {
-			return handler;
-		}
 		Object function = findFunctionForGet(request, path);
 		if (function != null) {
 			if (logger.isDebugEnabled()) {