diff --git a/internal/services/firewall/firewall_policy_resource.go b/internal/services/firewall/firewall_policy_resource.go
index d711db4ac576..79079d48c54b 100644
--- a/internal/services/firewall/firewall_policy_resource.go
+++ b/internal/services/firewall/firewall_policy_resource.go
@@ -668,6 +668,18 @@ func flattenFirewallPolicyIntrusionDetection(input *network.FirewallPolicyIntrus
 	}
 
 	signatureOverrides := make([]interface{}, 0)
+	trafficBypass := make([]interface{}, 0)
+
+	if input.Configuration == nil {
+		return []interface{}{
+			map[string]interface{}{
+				"mode":                string(input.Mode),
+				"signature_overrides": signatureOverrides,
+				"traffic_bypass":      trafficBypass,
+			},
+		}
+	}
+
 	if overrides := input.Configuration.SignatureOverrides; overrides != nil {
 		for _, override := range *overrides {
 			id := ""
@@ -681,7 +693,6 @@ func flattenFirewallPolicyIntrusionDetection(input *network.FirewallPolicyIntrus
 		}
 	}
 
-	trafficBypass := make([]interface{}, 0)
 	if bypasses := input.Configuration.BypassTrafficSettings; bypasses != nil {
 		for _, bypass := range *bypasses {
 			name := ""
@@ -742,7 +753,7 @@ func flattenFirewallPolicyIntrusionDetection(input *network.FirewallPolicyIntrus
 }
 
 func flattenFirewallPolicyTransportSecurity(input *network.FirewallPolicyTransportSecurity) []interface{} {
-	if input == nil {
+	if input == nil || input.CertificateAuthority == nil {
 		return []interface{}{}
 	}