diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp
index 8f0cba8..ed1ffc2 100644
--- a/redfish-core/include/utils/sw_utils.hpp
+++ b/redfish-core/include/utils/sw_utils.hpp
@@ -119,7 +119,7 @@
         return;
     }
 
-    if (version == nullptr || version->empty())
+    if (version == nullptr)
     {
         messages::internalError(asyncResp->res);
         return;
@@ -160,6 +160,11 @@
     }
     if (!activeVersionPropName.empty() && runningImage)
     {
+        if (version->empty())
+        {
+            BMCWEB_LOG_INFO("Version is empty for swId: {}", swId);
+            return;
+        }
         asyncResp->res.jsonValue[activeVersionPropName] = *version;
     }
 }