diff --git a/modules/folder/main.tf b/modules/folder/main.tf
index abf16ebe3..853dfde4d 100644
--- a/modules/folder/main.tf
+++ b/modules/folder/main.tf
@@ -43,7 +43,7 @@ resource "google_essential_contacts_contact" "contact" {
 }
 
 resource "google_compute_firewall_policy_association" "default" {
-  for_each          = toset(var.firewall_policy == null ? [] : [""])
+  count             = var.firewall_policy == null ? 0 : 1
   attachment_target = local.folder.id
   name              = var.firewall_policy.name
   firewall_policy   = var.firewall_policy.policy
diff --git a/modules/organization/main.tf b/modules/organization/main.tf
index 2d489668d..5b448df29 100644
--- a/modules/organization/main.tf
+++ b/modules/organization/main.tf
@@ -29,7 +29,7 @@ resource "google_essential_contacts_contact" "contact" {
 
 
 resource "google_compute_firewall_policy_association" "default" {
-  for_each          = toset(var.firewall_policy == null ? [] : [""])
+  count             = var.firewall_policy == null ? 0 : 1
   attachment_target = var.organization_id
   name              = var.firewall_policy.name
   firewall_policy   = var.firewall_policy.policy