diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
index 5bf4e33e94..4d5508d4a1 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
@@ -218,9 +218,10 @@ def validateMetronComponentLayout(self, hostsComponentsMap, serviceComponents):
         ]
 
         # find any metron components that have not been assigned to a host
+        components = set(component['name'] for componentList in hostsComponentsMap.values() for component in componentList)
         unassignedMetronComponents = []
         for component in metronComponents:
-          if (component not in hostsComponentsMap.values()):
+          if component['name'] not in components:
             unassignedMetronComponents.append(component)
 
         if len(unassignedMetronComponents) > 0: