diff --git a/vpc-interface-endpoint/main.tf b/vpc-interface-endpoint/main.tf
index 208eb89..1b5aa3e 100644
--- a/vpc-interface-endpoint/main.tf
+++ b/vpc-interface-endpoint/main.tf
@@ -74,7 +74,8 @@ locals {
 #  https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcEndpoints.html
 
 data "aws_vpc_endpoint_service" "interface_endpoint" {
-  service = local.service
+  service      = local.full_service_parts[0] == "com" ? local.service : null
+  service_name = local.full_service_parts[0] != "com" ? local.service : null
   filter {
     name   = "service-type"
     values = ["Interface"]