diff --git a/vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py b/vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py
index dc98484eed..68e7799502 100644
--- a/vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py
+++ b/vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py
@@ -600,6 +600,8 @@ class RouterSharedDriver(router_driver.RouterBaseDriver):
                         address_groups, admin_state)
 
     def _unbind_router_on_edge(self, context, router_id):
+        self.edge_manager.reconfigure_shared_edge_metadata_port(
+            context, router_id)
         self.edge_manager.unbind_router_on_edge(context, router_id)
         metadata_proxy_handler = self.plugin.metadata_proxy_handler
         if metadata_proxy_handler:
diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py
index b2dbf7cb45..3c7131c411 100644
--- a/vmware_nsx/plugins/nsx_v/plugin.py
+++ b/vmware_nsx/plugins/nsx_v/plugin.py
@@ -1079,6 +1079,9 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                         rtr_id = rtr_binding['router_id']
                         self.metadata_proxy_handler.cleanup_router_edge(
                             context, rtr_id)
+                else:
+                    self.edge_manager.reconfigure_shared_edge_metadata_port(
+                        context, (vcns_const.DHCP_EDGE_PREFIX + net_id)[:36])
 
     def _update_dhcp_edge_service(self, context, network_id, address_groups):
         self.edge_manager.update_dhcp_edge_service(
diff --git a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
index 91c81ba6bd..d86071c8b6 100644
--- a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
+++ b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
@@ -1006,6 +1006,12 @@ class EdgeManager(object):
                                          conflicting, availability_zone)
 
     def remove_network_from_dhcp_edge(self, context, network_id, edge_id):
+        # If DHCP edge was created initially for this network, metadata port
+        # Might use this network's DHCP router_id as device_id. Call the
+        # following to validate this
+        self.reconfigure_shared_edge_metadata_port(
+            context, (vcns_const.DHCP_EDGE_PREFIX + network_id)[:36])
+
         old_binding = nsxv_db.get_edge_vnic_binding(
             context.session, edge_id, network_id)
         if not old_binding:
@@ -1058,6 +1064,44 @@ class EdgeManager(object):
         nsxv_db.allocate_edge_vnic_with_tunnel_index(
             context.session, edge_id, network_id)
 
+    def reconfigure_shared_edge_metadata_port(self, context, org_router_id):
+        if not self.plugin.metadata_proxy_handler:
+            return
+
+        net_list = nsxv_db.get_nsxv_internal_network(
+            context.session,
+            vcns_const.InternalEdgePurposes.INTER_EDGE_PURPOSE)
+
+        if not net_list:
+            return
+        internal_net = net_list[0]['network_id']
+
+        ports = self.nsxv_plugin.get_ports(
+            context, filters={'device_id': [org_router_id],
+                              'network_id': [internal_net]})
+
+        if not ports:
+            LOG.debug('No metadata ports found for %s', org_router_id)
+            return
+        elif len(ports) > 1:
+            LOG.debug('Expecting one metadata port for %s. Found %d ports',
+                      org_router_id, len(ports))
+
+        org_binding = nsxv_db.get_nsxv_router_binding(context.session,
+                                                      org_router_id)
+
+        if org_binding:
+            edge_id = org_binding['edge_id']
+            bindings = nsxv_db.get_nsxv_router_bindings(
+                context.session, filters={'edge_id': [edge_id]})
+            for binding in bindings:
+                if binding['router_id'] != org_router_id:
+                    for port in ports:
+                        self.plugin.update_port(
+                            context, port['id'],
+                            {'port': {'device_id': binding['router_id']}})
+                    return
+
     def allocate_new_dhcp_edge(self, context, network_id, resource_id,
                                availability_zone):
         self._allocate_dhcp_edge_appliance(context, resource_id,