diff --git a/cloud/aws/README.md b/cloud/aws/README.md
index 68d2481..585f1e0 100644
--- a/cloud/aws/README.md
+++ b/cloud/aws/README.md
@@ -147,6 +147,8 @@ provider "aws" {
   - then change `create_metric_streams_iam` from `true` to `false` and run `terraform apply` to destroy the IAM role.
     If you do not follow that process, the AWS integration will end up in `CANCELATION_FAILED` status.
 
+Note: filtering metrics on tags does not work with Metric Streams, so the default filter on the `aws_tag_sfx_monitored` tag is not used. This can increase your SignalFX licensing costs when switching from pull based ingestion to push if not all EC2 hosts have to be monitored in an AWS account.
+
 ### CloudWatch Logs sync (BETA)
 
 - When enabling AWS Cloudwatch Logs sync with `enable_logs_sync = true`, you also need to set `create_logs_iam` to `true`. 
diff --git a/cloud/aws/integrations-aws.tf b/cloud/aws/integrations-aws.tf
index 564f69b..837cdaf 100644
--- a/cloud/aws/integrations-aws.tf
+++ b/cloud/aws/integrations-aws.tf
@@ -39,9 +39,9 @@ resource "signalfx_aws_integration" "aws_integration" {
 
 
   namespace_sync_rule {
-    default_action = var.ec2_namespace_sync_rule.default_action
-    filter_action  = var.ec2_namespace_sync_rule.filter_action
-    filter_source  = var.ec2_namespace_sync_rule.filter_source
+    default_action = var.use_metric_streams_sync ? null : var.ec2_namespace_sync_rule.default_action
+    filter_action  = var.use_metric_streams_sync ? null : var.ec2_namespace_sync_rule.filter_action
+    filter_source  = var.use_metric_streams_sync ? null : var.ec2_namespace_sync_rule.filter_source
     namespace      = var.ec2_namespace_sync_rule.namespace
   }
 
@@ -83,4 +83,3 @@ resource "signalfx_aws_integration" "aws_integration" {
     time_sleep.logs_policy_availability,
   ]
 }
-