diff --git a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java
index 624ba2d105..37e104f354 100644
--- a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java
+++ b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java
@@ -66,6 +66,16 @@ public class PathVariableAnnotationController {
 		}
 	}
 
+	@GetMapping(value = { "/api/defaultemployeeswithoptional", "/api/defaultemployeeswithoptional/{id}" })
+	@ResponseBody
+	public String getDefaultEmployeesByIdWithOptional(@PathVariable Optional<String> id) {
+		if (id.isPresent()) {
+			return "ID: " + id.get();
+		} else {
+			return "ID: Default Employee";
+		}
+	}
+
 	@GetMapping(value = { "/api/employeeswithmap/{id}", "/api/employeeswithmap" })
 	@ResponseBody
 	public String getEmployeesByIdWithMap(@PathVariable Map<String, String> pathVarsMap) {