diff --git a/azurestack/resource_arm_virtual_network_gateway.go b/azurestack/resource_arm_virtual_network_gateway.go
index a37fdda50..9eb092193 100644
--- a/azurestack/resource_arm_virtual_network_gateway.go
+++ b/azurestack/resource_arm_virtual_network_gateway.go
@@ -121,7 +121,7 @@ func resourceArmVirtualNetworkGateway() *schema.Resource {
 						"public_ip_address_id": {
 							Type:         schema.TypeString,
 							Optional:     true,
-							ValidateFunc: azure.ValidateResourceID,
+							ValidateFunc: azure.ValidateResourceIDOrEmpty,
 						},
 					},
 				},
@@ -262,7 +262,7 @@ func resourceArmVirtualNetworkGateway() *schema.Resource {
 			"default_local_network_gateway_id": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: azure.ValidateResourceID,
+				ValidateFunc: azure.ValidateResourceIDOrEmpty,
 			},
 
 			"tags": tagsSchema(),