diff --git a/cloudfront.cfndsl.rb b/cloudfront.cfndsl.rb
index 072a2b5..d217c27 100644
--- a/cloudfront.cfndsl.rb
+++ b/cloudfront.cfndsl.rb
@@ -18,7 +18,6 @@
   
   export = external_parameters.fetch(:export_name, external_parameters[:component_name])
 
-  Condition('WebACLEnabled', FnNot(FnEquals(Ref('WebACL'), ''))) # WebACL issue part, works well without this condition
   Condition('OverrideAliases', FnNot(FnEquals(Ref('OverrideAliases'), '')))
 
   tags = []
@@ -108,7 +107,7 @@
   distribution_config[:Enabled] = external_parameters[:enabled]
   distribution_config[:IPV6Enabled] = ipv6 unless ipv6.nil?
   distribution_config[:PriceClass] = Ref('PriceClass')
-  distribution_config[:WebACLId] = FnIf('WebACLEnabled', Ref('WebACL'), Ref('AWS::NoValue')) # WebACL issue part
+  distribution_config[:WebACLId] = Ref('WebACL')
   distribution_config[:CustomErrorResponses] = custom_error_responses unless custom_error_responses.nil?
 
   logs = external_parameters.fetch(:logs, {})
@@ -392,4 +391,4 @@
 
   end
 
-end
\ No newline at end of file
+end