diff --git a/src/runtime_src/core/pcie/linux/system_linux.cpp b/src/runtime_src/core/pcie/linux/system_linux.cpp
index 81e3011396b..742c99535bb 100644
--- a/src/runtime_src/core/pcie/linux/system_linux.cpp
+++ b/src/runtime_src/core/pcie/linux/system_linux.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2019-2022 Xilinx, Inc
-// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
 
 // Local - Include files
 #include "device_linux.h"
@@ -12,6 +12,7 @@
 #include "core/common/query_requests.h"
 
 // 3rd Party Library - Include files
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/format.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <gnu/libc-version.h>
@@ -82,9 +83,11 @@ driver_version(const std::string& driver)
     getline(ss, hash, ',');
   }
 
-  _pt.put("name", driver);
-  _pt.put("version", ver);
-  _pt.put("hash", hash);
+  if (!((boost::iequals(driver, "xclmgmt") || boost::iequals(driver, "xocl")) && (boost::iequals(ver, "unknown")))) {
+    _pt.put("name", driver);
+    _pt.put("version", ver);
+    _pt.put("hash", hash);
+  }
   return _pt;
 }
 
@@ -165,8 +168,11 @@ get_driver_info(boost::property_tree::ptree &pt)
 {
   boost::property_tree::ptree _ptDriverInfo;
 
-  for (const auto& drv : driver_list::get())
-    _ptDriverInfo.push_back( {"", driver_version(drv->name())} );
+  for (const auto& drv : driver_list::get()) {
+    boost::property_tree::ptree _drv = driver_version(drv->name());
+    if (!_drv.empty())
+      _ptDriverInfo.push_back( {"", _drv} );
+  }
   pt.put_child("drivers", _ptDriverInfo);
 }
 
diff --git a/src/runtime_src/core/tools/common/XBUtilities.cpp b/src/runtime_src/core/tools/common/XBUtilities.cpp
index 2fe35bbdabc..d9ce655f122 100755
--- a/src/runtime_src/core/tools/common/XBUtilities.cpp
+++ b/src/runtime_src/core/tools/common/XBUtilities.cpp
@@ -759,8 +759,6 @@ fill_xrt_versions(const boost::property_tree::ptree& pt_xrt,
       std::string drv_version = boost::iequals(drv_name, "N/A") ? drv_name : drv_name.append(" Version");
       output << boost::format("  %-20s : %s\n") % drv_version % driver.get<std::string>("version", "N/A");
     }
-    if (boost::iequals(drv_name, "xclmgmt") && boost::iequals(driver.get<std::string>("version", "N/A"), "unknown"))
-      output << "WARNING: xclmgmt version is unknown. Is xclmgmt driver loaded? Or is MSD/MPD running?" << std::endl;
   }
 
   try {