diff --git a/voltha/core/adapter_agent.py b/voltha/core/adapter_agent.py
index c404de9..02bc395 100644
--- a/voltha/core/adapter_agent.py
+++ b/voltha/core/adapter_agent.py
@@ -639,7 +639,8 @@
                        admin_state,
                        **kw):
         device_type = next((dt for dt in self.root_proxy.get('/device_types')
-                            if dt.vendor_id == vendor_id), None)
+                            if dt.vendor_id == vendor_id and \
+                            dt.id.endswith("_onu")), None)
         # we create new ONU device objects and insert them into the config
         device = Device(
             id=create_cluster_device_id(self.core.core_store_id),