diff --git a/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go b/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go
index 6a4a33126..b7baf5a84 100644
--- a/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go
+++ b/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go
@@ -155,11 +155,14 @@ func resourceNetworkingSubnetV2Create(d *schema.ResourceData, meta interface{})
 		createOpts.GatewayIP = &gatewayIP
 	}
 
-	if v, ok := d.GetOk("enable_dhcp"); ok {
-		enableDHCP := v.(bool)
-		createOpts.EnableDHCP = &enableDHCP
+	if noGateway {
+		disableGateway := ""
+		createOpts.GatewayIP = &disableGateway
 	}
 
+	enableDHCP := d.Get("enable_dhcp").(bool)
+	createOpts.EnableDHCP = &enableDHCP
+
 	if v, ok := d.GetOk("ip_version"); ok {
 		ipVersion := resourceNetworkingSubnetV2DetermineIPVersion(v.(int))
 		createOpts.IPVersion = ipVersion