diff --git a/packages/aws-cloudfront/__tests__/__snapshots__/lambda-at-edge.test.js.snap b/packages/aws-cloudfront/__tests__/__snapshots__/lambda-at-edge.test.js.snap
index f3c0233957..7cbb03cb04 100644
--- a/packages/aws-cloudfront/__tests__/__snapshots__/lambda-at-edge.test.js.snap
+++ b/packages/aws-cloudfront/__tests__/__snapshots__/lambda-at-edge.test.js.snap
@@ -55,12 +55,12 @@ Object {
               },
               Object {
                 "EventType": "origin-response",
-                "IncludeBody": true,
+                "IncludeBody": undefined,
                 "LambdaFunctionARN": "arn:aws:lambda:us-east-1:123:function:originResponseFunction",
               },
               Object {
                 "EventType": "viewer-response",
-                "IncludeBody": true,
+                "IncludeBody": undefined,
                 "LambdaFunctionARN": "arn:aws:lambda:us-east-1:123:function:viewerResponseFunction",
               },
             ],
diff --git a/packages/aws-cloudfront/__tests__/lambda-at-edge.test.js b/packages/aws-cloudfront/__tests__/lambda-at-edge.test.js
index 430c584902..076f5d0049 100644
--- a/packages/aws-cloudfront/__tests__/lambda-at-edge.test.js
+++ b/packages/aws-cloudfront/__tests__/lambda-at-edge.test.js
@@ -64,14 +64,12 @@ describe("Input origin as a custom url", () => {
           {
             EventType: "origin-response",
             LambdaFunctionARN:
-              "arn:aws:lambda:us-east-1:123:function:originResponseFunction",
-            IncludeBody: true
+              "arn:aws:lambda:us-east-1:123:function:originResponseFunction"
           },
           {
             EventType: "viewer-response",
             LambdaFunctionARN:
-              "arn:aws:lambda:us-east-1:123:function:viewerResponseFunction",
-            IncludeBody: true
+              "arn:aws:lambda:us-east-1:123:function:viewerResponseFunction"
           }
         ]
       }
diff --git a/packages/aws-cloudfront/lib/addLambdaAtEdgeToCacheBehavior.js b/packages/aws-cloudfront/lib/addLambdaAtEdgeToCacheBehavior.js
index 6fc30de9eb..aa0aef6873 100644
--- a/packages/aws-cloudfront/lib/addLambdaAtEdgeToCacheBehavior.js
+++ b/packages/aws-cloudfront/lib/addLambdaAtEdgeToCacheBehavior.js
@@ -19,7 +19,7 @@ module.exports = (cacheBehavior, lambdaAtEdgeConfig = {}) => {
     cacheBehavior.LambdaFunctionAssociations.Items.push({
       EventType: eventType,
       LambdaFunctionARN: lambdaAtEdgeConfig[eventType],
-      IncludeBody: true
+      IncludeBody: eventType.includes("request") ? true : undefined
     });
   });
 };