diff --git a/azurerm/internal/services/frontdoor/resource_arm_front_door.go b/azurerm/internal/services/frontdoor/resource_arm_front_door.go
index c44911201728..3bccc29a445b 100644
--- a/azurerm/internal/services/frontdoor/resource_arm_front_door.go
+++ b/azurerm/internal/services/frontdoor/resource_arm_front_door.go
@@ -832,7 +832,11 @@ func expandArmFrontDoorFrontendEndpoint(input []interface{}, frontDoorPath strin
 
 func expandArmFrontDoorCustomHTTPSConfiguration(input []interface{}) *frontdoor.CustomHTTPSConfiguration {
 	if len(input) == 0 {
+		// https://github.com/Azure/azure-sdk-for-go/issues/6882
+		defaultProtocolType := "ServerNameIndication"
+
 		defaultHttpsConfiguration := frontdoor.CustomHTTPSConfiguration{
+			ProtocolType:      &defaultProtocolType,
 			CertificateSource: frontdoor.CertificateSourceFrontDoor,
 			CertificateSourceParameters: &frontdoor.CertificateSourceParameters{
 				CertificateType: frontdoor.Dedicated,
@@ -1434,7 +1438,12 @@ func flattenArmFrontDoorFrontendEndpointsSubResources(input *[]frontdoor.SubReso
 }
 
 func makeCustomHttpsConfiguration(customHttpsConfiguration map[string]interface{}) frontdoor.CustomHTTPSConfiguration {
-	customHTTPSConfigurationUpdate := frontdoor.CustomHTTPSConfiguration{}
+	// https://github.com/Azure/azure-sdk-for-go/issues/6882
+	defaultProtocolType := "ServerNameIndication"
+
+	customHTTPSConfigurationUpdate := frontdoor.CustomHTTPSConfiguration{
+		ProtocolType: &defaultProtocolType,
+	}
 
 	if customHttpsConfiguration["certificate_source"].(string) == "AzureKeyVault" {
 		vaultSecret := customHttpsConfiguration["azure_key_vault_certificate_secret_name"].(string)
diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go
index 06aa6d9c9442..4ab716b99448 100644
--- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go
+++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go
@@ -243,7 +243,7 @@ custom_rule {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
   name     = "testAccRG-%d"
-  location = "%s"
+  location = "%[2]s"
 }
 
 resource "azurerm_frontdoor_firewall_policy" "test" {
@@ -272,7 +272,7 @@ resource "azurerm_frontdoor_firewall_policy" "test" {
     }
   }
 
-  %s
+  %[3]s
 
   managed_rule {
     type    = "DefaultRuleSet"