diff --git a/aws/data_source_aws_vpc.go b/aws/data_source_aws_vpc.go
index 446fbc61e0c6..430fcd62b916 100644
--- a/aws/data_source_aws_vpc.go
+++ b/aws/data_source_aws_vpc.go
@@ -194,7 +194,7 @@ func dataSourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 		Partition: meta.(*AWSClient).partition,
 		Service:   ec2.ServiceName,
 		Region:    meta.(*AWSClient).region,
-		AccountID: meta.(*AWSClient).accountid,
+		AccountID: aws.StringValue(vpc.OwnerId),
 		Resource:  fmt.Sprintf("vpc/%s", d.Id()),
 	}.String()
 	d.Set("arn", arn)
diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go
index 8b2a82b740db..b01bcbddf87e 100644
--- a/aws/resource_aws_vpc.go
+++ b/aws/resource_aws_vpc.go
@@ -272,7 +272,7 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 		Partition: meta.(*AWSClient).partition,
 		Service:   ec2.ServiceName,
 		Region:    meta.(*AWSClient).region,
-		AccountID: meta.(*AWSClient).accountid,
+		AccountID: aws.StringValue(vpc.OwnerId),
 		Resource:  fmt.Sprintf("vpc/%s", d.Id()),
 	}.String()
 	d.Set("arn", arn)
diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
index 05e3dc88d9be..8d4e00d149ab 100644
--- a/website/docs/index.html.markdown
+++ b/website/docs/index.html.markdown
@@ -335,8 +335,6 @@ This functionality is only supported in the following resources:
     - [`aws_synthetics_canary` resource](/docs/providers/aws/r/synthetics_canary.html)
     - [`aws_vpc_endpoint_service` data source](/docs/providers/aws/d/vpc_endpoint_service.html)
     - [`aws_vpc_endpoint_service` resource](/docs/providers/aws/r/vpc_endpoint_service.html)
-    - [`aws_vpc` data source](/docs/providers/aws/d/vpc.html)
-    - [`aws_vpc` resource](/docs/providers/aws/r/vpc.html)
     - [`aws_vpn_connection` resource](/docs/providers/aws/r/vpn_connection.html)
     - [`aws_vpn_gateway` data source](/docs/providers/aws/d/vpn_gateway.html)
     - [`aws_vpn_gateway` resource](/docs/providers/aws/r/vpn_gateway.html)