diff --git a/salt/config/__init__.py b/salt/config/__init__.py
index dee254367e..5ff7bd24d3 100644
--- a/salt/config/__init__.py
+++ b/salt/config/__init__.py
@@ -1494,13 +1494,7 @@ DEFAULT_MINION_OPTS = {
         'automatic': ['IPAddress', 'Gateway',
                       'GlobalIPv6Address', 'IPv6Gateway'],
     },
-    'discovery': {
-        'attempts': 3,
-        'pause': 5,
-        'port': 4520,
-        'match': 'any',
-        'mapping': {},
-    },
+    'discovery': False,
     'schedule': {},
 }
 
@@ -1831,10 +1825,7 @@ DEFAULT_MASTER_OPTS = {
     'salt_cp_chunk_size': 98304,
     'require_minion_sign_messages': False,
     'drop_messages_signature_fail': False,
-    'discovery': {
-        'port': 4520,
-        'mapping': {},
-    },
+    'discovery': False,
     'schedule': {},
     'auth_events': True,
     'minion_data_cache_events': True,