diff --git a/http/http_response.hpp b/http/http_response.hpp
index 706bfb1..33f24b3 100644
--- a/http/http_response.hpp
+++ b/http/http_response.hpp
@@ -203,8 +203,8 @@
         }
         response.content_length(*pSize);
 
-        if (is1XXReturn || result() == status::no_content ||
-            result() == status::not_modified)
+        if ((*pSize > 0) && (is1XXReturn || result() == status::no_content ||
+                             result() == status::not_modified))
         {
             BMCWEB_LOG_CRITICAL("{} Response content provided but code was "
                                 "no-content or not_modified, which aren't "
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 832c644..2be5dde 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -3211,8 +3211,6 @@
         return;
     }
 
-    asyncResp->res.result(boost::beast::http::status::no_content);
-
     if (assetTag)
     {
         setAssetTag(asyncResp, *assetTag);