diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/MicronautResponseWriter.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/MicronautResponseWriter.java
index fdac101fee..5278464276 100644
--- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/MicronautResponseWriter.java
+++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/MicronautResponseWriter.java
@@ -123,8 +123,9 @@ private static Map<String, String> getHeaders(AwsProxyResponse awsProxyResponse)
         Map<String, String> headers = new LinkedHashMap<>();
         for (Map.Entry<String, List<String>> entry : multiValueHeaders.entrySet()) {
             List<String> headerValues = entry.getValue();
-            if (headerValues != null && headerValues.size() == 1) {
-                headers.put(entry.getKey(), headerValues.get(0));
+            if (headerValues != null) {
+                headerValues.stream().findFirst()
+                    .ifPresent(value -> headers.put(entry.getKey(), value));
             }
         }
         return headers;