diff --git a/monkey/monkey_island/cc/resources/aws_exporter.py b/monkey/monkey_island/cc/resources/aws_exporter.py
index 0d9b0a157..e7221a668 100644
--- a/monkey/monkey_island/cc/resources/aws_exporter.py
+++ b/monkey/monkey_island/cc/resources/aws_exporter.py
@@ -21,6 +21,9 @@ class AWSExporter(Exporter):
 
         findings_list = []
         issues_list = report_json['recommendations']['issues']
+        if not issues_list:
+            logger.info('No issues were found by the monkey, no need to send anything')
+            return True
         for machine in issues_list:
             for issue in issues_list[machine]:
                 findings_list.append(AWSExporter._prepare_finding(issue))
diff --git a/monkey/monkey_island/cc/server_config.json b/monkey/monkey_island/cc/server_config.json
index 4d8644cbb..82211562f 100644
--- a/monkey/monkey_island/cc/server_config.json
+++ b/monkey/monkey_island/cc/server_config.json
@@ -1,6 +1,6 @@
 {
   "server_config": "standard",
   "aws": {
-    "sec_hub_product_arn": "arn:aws:securityhub:us-west-2:324264561773:product/aws/guardduty"
+    "sec_hub_product_arn": "arn:aws:securityhub:eu-west-2:324264561773:product/guardicore/aws-infection-monkey"
   }
 }
\ No newline at end of file