diff --git a/changelog.md b/changelog.md
index ef121b1..55591d4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Architect Deploy changelog
 
+## [5.0.8] 2024-06-06
+
+### Fixed
+
+- Handle CDN invalidations only if CDN explicitly enabled
+
 ---
 
 ## [5.0.7] 2024-04-30
diff --git a/src/sam/02-after/00-get-app-apex/index.js b/src/sam/02-after/00-get-app-apex/index.js
index a041826..c29af4b 100644
--- a/src/sam/02-after/00-get-app-apex/index.js
+++ b/src/sam/02-after/00-get-app-apex/index.js
@@ -88,7 +88,7 @@ module.exports = function getAppApex (params, callback) {
           else callback()
         },
         function invalidateS3 (callback) {
-          if (s3 && !creatingS3 && !enablingS3 && !destroyingS3) {
+          if (cdnEnabled && s3 && !creatingS3 && !enablingS3 && !destroyingS3) {
             update.status('Invalidating static asset (S3) CDN distribution cache')
             aws.cloudfront.CreateInvalidation({
               Id: s3.id,
@@ -132,7 +132,7 @@ module.exports = function getAppApex (params, callback) {
           else callback()
         },
         function invalidateApiGateway (callback) {
-          if (apigateway && !creatingApiGateway && !enablingApiGateway && !destroyingApiGateway) {
+          if (cdnEnabled && apigateway && !creatingApiGateway && !enablingApiGateway && !destroyingApiGateway) {
             update.status('Invalidating API Gateway CDN distribution cache')
             aws.cloudfront.CreateInvalidation({
               Id: apigateway.id,