diff --git a/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go b/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go
index 3fefde15c360..6c29d3fd4440 100644
--- a/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go
+++ b/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go
@@ -167,7 +167,7 @@ func resourceArmEventGridEventSubscription() *schema.Resource {
 				Type:          schema.TypeList,
 				MaxItems:      1,
 				Optional:      true,
-				ConflictsWith: RemoveFromStringArray(getEnpointTypes(), "hybrid_connection_endpoint"),
+				ConflictsWith: RemoveFromStringArray(getEnpointTypes(), "webhook_endpoint"),
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"url": {
@@ -525,7 +525,7 @@ func resourceArmEventGridEventSubscriptionRead(d *schema.ResourceData, meta inte
 			}
 
 			if err := d.Set("advanced_filter", flattenEventGridEventSubscriptionAdvancedFilter(filter.AdvancedFilters)); err != nil {
-				return fmt.Errorf("Error setting `advanced_filter_scalar` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err)
+				return fmt.Errorf("Error setting `advanced_filter` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err)
 			}
 		}
 
@@ -717,13 +717,13 @@ func expandEventGridEventSubscriptionAzureFunctionEndpoint(d *schema.ResourceDat
 	props := d.Get("azure_function_endpoint").([]interface{})[0].(map[string]interface{})
 	azureFunctionResourceID := props["azure_function_id"].(string)
 
-	storageQueueEndpoint := eventgrid.AzureFunctionEventSubscriptionDestination{
+	azureFunctionEndpoint := eventgrid.AzureFunctionEventSubscriptionDestination{
 		EndpointType: eventgrid.EndpointTypeAzureFunction,
 		AzureFunctionEventSubscriptionDestinationProperties: &eventgrid.AzureFunctionEventSubscriptionDestinationProperties{
 			ResourceID: &azureFunctionResourceID,
 		},
 	}
-	return storageQueueEndpoint
+	return azureFunctionEndpoint
 }
 
 func expandEventGridEventSubscriptionFilter(d *schema.ResourceData) (*eventgrid.EventSubscriptionFilter, error) {
@@ -774,6 +774,7 @@ func expandAdvancedFilter(config map[string]interface{}) (eventgrid.BasicAdvance
 		string(eventgrid.OperatorTypeNumberGreaterThanOrEquals),
 		string(eventgrid.OperatorTypeNumberLessThan),
 		string(eventgrid.OperatorTypeNumberLessThanOrEquals):
+		// Workaround as long as nested schema validation is not working as expected (see https://github.com/hashicorp/terraform-plugin-sdk/issues/71)
 		if values != nil && len(*values) > 0 {
 			return nil, fmt.Errorf("Conflicting field for `advanced_filter` (key=%s, operator_type=%s): values", key, operatorType)
 		}
@@ -789,6 +790,7 @@ func expandAdvancedFilter(config map[string]interface{}) (eventgrid.BasicAdvance
 		string(eventgrid.OperatorTypeStringEndsWith),
 		string(eventgrid.OperatorTypeStringIn),
 		string(eventgrid.OperatorTypeStringNotIn):
+		// Workaround as long as nested schema validation is not working as expected (see https://github.com/hashicorp/terraform-plugin-sdk/issues/71)
 		if &value != nil && len(value) > 0 {
 			return nil, fmt.Errorf("Conflicting field for `advanced_filter` (key=%s, operator_type=%s): value", key, operatorType)
 		}