diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index f22eb098..e4604fc9 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -412,16 +412,18 @@ class IpmiHandler(object):
         raise Exception('Unsupported scenario...')
 
     def read_inventory(self, component):
+        invitems = []
         if component == 'all':
             for invdata in self.ipmicmd.get_inventory():
                 if invdata[1] is None:
                     newinf = {'present': False, 'information': None}
                 else:
+                    sanitize_invdata(invdata[1])
                     newinf = {'present': True, 'information': invdata[1]}
                 newinf['name'] = invdata[0]
-                newinvdata = {'inventory': [newinf]}
-                sanitize_invdata(newinvdata['inventory'][0])
-                self.output.put(msg.KeyValueData(newinvdata, self.node))
+                invitems.append(newinf)
+            newinvdata = {'inventory': invitems}
+            self.output.put(msg.KeyValueData(newinvdata, self.node))
 
     def handle_sensors(self):
         if self.element[-1] == '':