diff --git a/vmware_nsx/plugins/nsx_p/availability_zones.py b/vmware_nsx/plugins/nsx_p/availability_zones.py
index 65e59fec1a..70687f6657 100644
--- a/vmware_nsx/plugins/nsx_p/availability_zones.py
+++ b/vmware_nsx/plugins/nsx_p/availability_zones.py
@@ -21,6 +21,7 @@ from vmware_nsx.common import config
 from vmware_nsx.common import exceptions as nsx_exc
 from vmware_nsx.plugins.common_v3 import availability_zones as v3_az
 from vmware_nsxlib.v3 import exceptions as nsx_lib_exc
+from vmware_nsxlib.v3.policy import utils as p_utils
 
 LOG = log.getLogger(__name__)
 
@@ -143,6 +144,76 @@ class NsxPAvailabilityZone(v3_az.NsxV3AvailabilityZone):
             self._native_dhcp_profile_uuid = None
             self._native_md_proxy_uuid = None
 
+    def _get_edge_cluster_tzs(self, nsxpolicy, nsxlib, ec_uuid):
+        ec_nodes = nsxpolicy.edge_cluster.get_edge_node_ids(ec_uuid)
+        ec_tzs = []
+        for tn_uuid in ec_nodes:
+            ec_tzs.extend(nsxlib.transport_node.get_transport_zones(
+                tn_uuid))
+        return ec_tzs
+
+    def _validate_tz(self, nsxpolicy, nsxlib, obj_type, obj_id, ec_uuid):
+        obj_tzs = self._get_edge_cluster_tzs(nsxpolicy, nsxlib, ec_uuid)
+        if self._default_overlay_tz_uuid not in obj_tzs:
+            msg = (_("%(type)s %(id)s of availability zone %(az)s with edge "
+                     "cluster %(ec)s does not match the default overlay tz "
+                     "%(tz)s") % {
+                'type': obj_type,
+                'id': obj_id,
+                'ec': ec_uuid,
+                'tz': self._default_overlay_tz_uuid,
+                'az': self.name})
+            raise nsx_exc.NsxPluginException(err_msg=msg)
+
+        if (self._default_vlan_tz_uuid and
+            self._default_vlan_tz_uuid not in obj_tzs):
+            msg = (_("%(type)s %(id)s of availability zone %(az)s with edge "
+                     "cluster %(ec)s does not match the default vlan tz "
+                     "%(tz)s") % {
+                'id': obj_id,
+                'ec': ec_uuid,
+                'tz': self._default_vlan_tz_uuid,
+                'az': self.name})
+            raise nsx_exc.NsxPluginException(err_msg=msg)
+
+    def validate_availability_zone(self, nsxpolicy, nsxlib=None):
+        """Validate that all the components of this AZ are connected"""
+
+        if not nsxlib:
+            LOG.warning("Cannot validate availability zone %s without "
+                        "passthrough api", self.name)
+            return
+
+        # Validate tier0 TZ match the default ones
+        tier0_ec_path = nsxpolicy.tier0.get_edge_cluster_path(
+            self._default_tier0_router)
+        if not tier0_ec_path:
+            msg = (_("Tier0 %(id)s of availability zone %(az)s does not have "
+                     "an edge cluster") % {
+                'id': self._default_tier0_router,
+                'az': self.name})
+            raise nsx_exc.NsxPluginException(err_msg=msg)
+        tier0_ec_uuid = p_utils.path_to_id(tier0_ec_path)
+        self._validate_tz(nsxpolicy, nsxlib, 'Tier0',
+                          self._default_tier0_router,
+                          tier0_ec_uuid)
+
+        if self._native_dhcp_profile_uuid:
+            dhcp_ec = nsxlib.native_dhcp_profile.get(
+                self._native_dhcp_profile_uuid).get('edge_cluster_id')
+            if dhcp_ec != tier0_ec_uuid:
+                self._validate_tz(nsxpolicy, nsxlib, 'DHCP profile',
+                                  self._native_dhcp_profile_uuid,
+                                  dhcp_ec)
+
+        if self._native_md_proxy_uuid:
+            md_ec = nsxlib.native_md_proxy.get(
+                self._native_md_proxy_uuid).get('edge_cluster_id')
+            if md_ec != tier0_ec_uuid:
+                self._validate_tz(nsxpolicy, nsxlib, 'MD Proxy',
+                                  self._native_md_proxy_uuid,
+                                  md_ec)
+
 
 class NsxPAvailabilityZones(common_az.ConfiguredAvailabilityZones):
 
diff --git a/vmware_nsx/plugins/nsx_p/plugin.py b/vmware_nsx/plugins/nsx_p/plugin.py
index 85af5b0a9c..f79442da93 100644
--- a/vmware_nsx/plugins/nsx_p/plugin.py
+++ b/vmware_nsx/plugins/nsx_p/plugin.py
@@ -280,6 +280,7 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
         for az in self.get_azs_list():
             az.translate_configured_names_to_uuids(
                 self.nsxpolicy, nsxlib=self.nsxlib, search_scope=search_scope)
+            az.validate_availability_zone(self.nsxpolicy, nsxlib=self.nsxlib)
 
         # WAF is currently not supported by the NSX
         self._waf_profile_uuid = None
diff --git a/vmware_nsx/tests/unit/nsx_p/test_plugin.py b/vmware_nsx/tests/unit/nsx_p/test_plugin.py
index 4e93316d2b..094e0b238d 100644
--- a/vmware_nsx/tests/unit/nsx_p/test_plugin.py
+++ b/vmware_nsx/tests/unit/nsx_p/test_plugin.py
@@ -133,6 +133,11 @@ class NsxPPluginTestCaseMixin(
                    "NsxPolicySegmentApi.set_admin_state").start()
         mock.patch("vmware_nsxlib.v3.policy.core_resources."
                    "NsxPolicySegmentPortApi.set_admin_state").start()
+        mock.patch("vmware_nsxlib.v3.policy.core_resources.NsxPolicyTier0Api."
+                   "get_edge_cluster_path", return_value="x/1").start()
+        mock.patch("vmware_nsxlib.v3.policy.core_resources."
+                   "NsxPolicyEdgeClusterApi.get_edge_node_ids",
+                   return_value=["node1"]).start()
         mock.patch("vmware_nsxlib.v3.NsxLib.get_tag_limits",
                    return_value=nsxlib_utils.TagLimits(20, 40, 15)).start()
         # Add some nsxlib mocks for the passthrough apis
@@ -140,6 +145,10 @@ class NsxPPluginTestCaseMixin(
                    return_value=nsx_constants.NSX_VERSION_2_5_0).start()
         mock.patch("vmware_nsxlib.v3.core_resources.NsxLibLogicalRouter."
                    "update").start()
+        mock.patch("vmware_nsxlib.v3.core_resources.NsxLibTransportNode."
+                   "get_transport_zones",
+                   return_value=[NSX_OVERLAY_TZ_NAME,
+                                 NSX_VLAN_TZ_NAME]).start()
 
     def _mock_nsxlib_backend_calls(self):
         """Mock nsxlib backend calls used as passthrough