diff --git a/builtin/providers/aws/resource_aws_route53_zone.go b/builtin/providers/aws/resource_aws_route53_zone.go
index e6c8be571..b60c91a79 100644
--- a/builtin/providers/aws/resource_aws_route53_zone.go
+++ b/builtin/providers/aws/resource_aws_route53_zone.go
@@ -105,7 +105,10 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error
 	if resp.ResourceTagSet != nil {
 		tags = resp.ResourceTagSet.Tags
 	}
-	d.Set("tags", tagsToMapR53(tags))
+
+	if err := d.Set("tags", tagsToMapR53(tags)); err != nil {
+		return err
+	}
 
 	return nil
 }