diff --git a/pyghmi/redfish/oem/generic.py b/pyghmi/redfish/oem/generic.py
index d702bd56..aadb2e54 100644
--- a/pyghmi/redfish/oem/generic.py
+++ b/pyghmi/redfish/oem/generic.py
@@ -738,6 +738,8 @@ class OEMHandler(object):
             if aname in macinfobyadpname:
                 del macinfobyadpname[aname]
             yield aname, yieldinf
+        if onlyname:
+            return
         if macinfobyadpname:
             for adp in macinfobyadpname:
                 yield adp, macinfobyadpname[adp]