diff --git a/routeros/resource_ip_dhcp_server.go b/routeros/resource_ip_dhcp_server.go
index ccf4fdae..1b9cb605 100644
--- a/routeros/resource_ip_dhcp_server.go
+++ b/routeros/resource_ip_dhcp_server.go
@@ -19,9 +19,9 @@ func ResourceDhcpServer() *schema.Resource {
 		"address_pool": {
 			Type:     schema.TypeString,
 			Optional: true,
-			Default:  "static-only",
 			Description: "IP pool, from which to take IP addresses for the clients. If set to static-only, then only " +
 				"the clients that have a static lease (added in lease submenu) will be allowed.",
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 		"allow_dual_stack_queue": {
 			Type:     schema.TypeBool,
@@ -35,11 +35,11 @@ func ResourceDhcpServer() *schema.Resource {
 			Description: "Always send replies as broadcasts even if destination IP is known.",
 		},
 		"authoritative": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "yes",
-			Description:  "Option changes the way how a server responds to DHCP requests.",
-			ValidateFunc: validation.StringInSlice([]string{"after-10sec-delay", "after-2sec-delay", "yes", "no"}, false),
+			Type:             schema.TypeString,
+			Optional:         true,
+			Description:      "Option changes the way how a server responds to DHCP requests.",
+			ValidateFunc:     validation.StringInSlice([]string{"after-10sec-delay", "after-2sec-delay", "yes", "no"}, false),
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 		"bootp_lease_time": {
 			Type:     schema.TypeString,
@@ -50,9 +50,9 @@ func ResourceDhcpServer() *schema.Resource {
 		"bootp_support": {
 			Type:             schema.TypeString,
 			Optional:         true,
-			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 			Description:      "Support for BOOTP clients.",
 			ValidateFunc:     validation.StringInSlice([]string{"none", "static", "dynamic"}, false),
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 		"client_mac_limit": {
 			Type:        schema.TypeInt,
@@ -94,11 +94,11 @@ func ResourceDhcpServer() *schema.Resource {
 			Description: "A script that will be executed after a lease is assigned or de-assigned.",
 		},
 		"lease_time": {
-			Type:             schema.TypeString,
-			Optional:         true,
-			DiffSuppressFunc: AlwaysPresentNotUserProvided,
+			Type:     schema.TypeString,
+			Optional: true,
 			Description: "The time that a client may use the assigned address. The client will try to renew this " +
 				"address after half of this time and will request a new address after the time limit expires.",
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 		KeyName: PropNameForceNewRw,
 		"parent_queue": {
@@ -124,11 +124,11 @@ func ResourceDhcpServer() *schema.Resource {
 			Description: "Forward RADIUS Framed-Route as a DHCP Classless-Static-Route to DHCP-client.",
 		},
 		"use_radius": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "no",
-			Description:  "Whether to use RADIUS server.",
-			ValidateFunc: validation.StringInSlice([]string{"yes", "no", "accounting"}, false),
+			Type:             schema.TypeString,
+			Optional:         true,
+			Description:      "Whether to use RADIUS server.",
+			ValidateFunc:     validation.StringInSlice([]string{"yes", "no", "accounting"}, false),
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 	}
 	return &schema.Resource{