diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 45d3442dcc..f26f680426 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -168,7 +168,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
         attrs['allocation_pools'] = parsed_args.allocation_pools
     if parsed_args.dhcp:
         attrs['enable_dhcp'] = True
-    elif parsed_args.no_dhcp:
+    if parsed_args.no_dhcp:
         attrs['enable_dhcp'] = False
     if ('dns_nameservers' in parsed_args and
        parsed_args.dns_nameservers is not None):
@@ -223,7 +223,6 @@ class CreateSubnet(command.ShowOne):
         dhcp_enable_group.add_argument(
             '--dhcp',
             action='store_true',
-            default=True,
             help=_("Enable DHCP (default)")
         )
         dhcp_enable_group.add_argument(
diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py
index 46af44fb5b..e24b49e803 100644
--- a/openstackclient/tests/network/v2/test_subnet.py
+++ b/openstackclient/tests/network/v2/test_subnet.py
@@ -236,7 +236,6 @@ class TestCreateSubnet(TestSubnet):
 
         self.network.create_subnet.assert_called_once_with(**{
             'cidr': self._subnet.cidr,
-            'enable_dhcp': self._subnet.enable_dhcp,
             'ip_version': self._subnet.ip_version,
             'name': self._subnet.name,
             'network_id': self._subnet.network_id,
@@ -410,7 +409,6 @@ class TestCreateSubnet(TestSubnet):
 
         self.network.create_subnet.assert_called_once_with(**{
             'cidr': self._subnet.cidr,
-            'enable_dhcp': self._subnet.enable_dhcp,
             'ip_version': self._subnet.ip_version,
             'name': self._subnet.name,
             'network_id': self._subnet.network_id,