diff --git a/etc/nsx.ini b/etc/nsx.ini
index 70c31e0c07..7946b610ec 100644
--- a/etc/nsx.ini
+++ b/etc/nsx.ini
@@ -402,4 +402,4 @@
 
 # If True, an internal metadata network will be created for a router only when
 # the router is attached to a DHCP-disabled subnet.
-# metadata_on_demand = True
+# metadata_on_demand = False
diff --git a/vmware_nsx/common/config.py b/vmware_nsx/common/config.py
index 4a84cda8f6..771b33b404 100644
--- a/vmware_nsx/common/config.py
+++ b/vmware_nsx/common/config.py
@@ -253,7 +253,7 @@ nsx_v3_opts = [
                       "does not support namespaces otherwise access_network "
                       "should be used.")),
     cfg.BoolOpt('metadata_on_demand',
-                default=True,
+                default=False,
                 help=_("If true, an internal metadata network will be created "
                        "for a router only when the router is attached to a "
                        "DHCP-disabled subnet.")),
diff --git a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
index a64942ebcb..b07e2183fb 100644
--- a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
+++ b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
@@ -330,7 +330,8 @@ class TestL3NatTestCase(L3NatTest,
               ext_mgr=None,
               service_plugins=None):
         super(TestL3NatTestCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
-        cfg.CONF.set_override('metadata_mode', None, 'NSX')
+        cfg.CONF.set_override('metadata_mode', None, 'nsx_v3')
+        cfg.CONF.set_override('metadata_on_demand', False, 'nsx_v3')
 
     def _test_create_l3_ext_network(
             self, physical_network=nsx_v3_mocks.DEFAULT_TIER0_ROUTER_UUID):