diff --git a/src/storagecommands.cpp b/src/storagecommands.cpp
index 4d27e6e..1d8763c 100644
--- a/src/storagecommands.cpp
+++ b/src/storagecommands.cpp
@@ -545,14 +545,15 @@
                     return false;
                 }
 
+                // At this point we found the device entry and should return
+                // true.
                 auto findIpmiDevice = entry.second.find(
                     "xyz.openbmc_project.Inventory.Decorator.Ipmi");
-                if (findIpmiDevice == entry.second.end())
+                if (findIpmiDevice != entry.second.end())
                 {
-                    return false;
+                    entityData = &(findIpmiDevice->second);
                 }
 
-                entityData = &(findIpmiDevice->second);
                 return true;
             });