diff --git a/internal/resource_org_wxrule/sdk_to_terraform.go b/internal/resource_org_wxrule/sdk_to_terraform.go
index 4fb4487..b1481b2 100644
--- a/internal/resource_org_wxrule/sdk_to_terraform.go
+++ b/internal/resource_org_wxrule/sdk_to_terraform.go
@@ -33,10 +33,10 @@ func SdkToTerraform(ctx context.Context, data *models.WxlanRule) (OrgWxruleModel
 	if data.BlockedApps != nil && len(data.BlockedApps) > 0 {
 		blocked_apps = mist_transform.ListOfStringSdkToTerraform(ctx, data.BlockedApps)
 	}
-	if data.DstAllowWxtags != nil && len(data.DstAllowWxtags) > 0 {
+	if data.DstAllowWxtags != nil {
 		dst_allow_wxtags = mist_transform.ListOfStringSdkToTerraform(ctx, data.DstAllowWxtags)
 	}
-	if data.DstDenyWxtags != nil && len(data.DstDenyWxtags) > 0 {
+	if data.DstDenyWxtags != nil {
 		dst_deny_wxtags = mist_transform.ListOfStringSdkToTerraform(ctx, data.DstDenyWxtags)
 	}
 	if data.DstWxtags != nil {
@@ -45,7 +45,7 @@ func SdkToTerraform(ctx context.Context, data *models.WxlanRule) (OrgWxruleModel
 	if data.Enabled != nil {
 		enabled = types.BoolValue(*data.Enabled)
 	}
-	if data.SrcWxtags != nil && len(data.SrcWxtags) > 0 {
+	if data.SrcWxtags != nil {
 		src_wxtags = mist_transform.ListOfStringSdkToTerraform(ctx, data.SrcWxtags)
 	}
 
diff --git a/internal/resource_org_wxrule/terraform_to_sdk.go b/internal/resource_org_wxrule/terraform_to_sdk.go
index 3920ed4..9711ac6 100644
--- a/internal/resource_org_wxrule/terraform_to_sdk.go
+++ b/internal/resource_org_wxrule/terraform_to_sdk.go
@@ -58,12 +58,15 @@ func TerraformToSdk(ctx context.Context, plan *OrgWxruleModel) (*models.WxlanRul
 	if !plan.Enabled.IsNull() && !plan.Enabled.IsUnknown() {
 		data.Enabled = plan.Enabled.ValueBoolPointer()
 	}
+
 	if !plan.Order.IsNull() && !plan.Order.IsUnknown() {
 		data.Order = int(plan.Order.ValueInt64())
 	}
+
 	if !plan.SrcWxtags.IsNull() && !plan.SrcWxtags.IsUnknown() {
 		data.SrcWxtags = mist_transform.ListOfStringTerraformToSdk(ctx, plan.SrcWxtags)
-	} else {
+	}
+	if data.SrcWxtags == nil {
 		data.SrcWxtags = make([]string, 0)
 	}