diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 829ce00..176c67f 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -1510,10 +1510,10 @@
         res.jsonValue["SerialConsole"]["ServiceEnabled"] = true;
         res.jsonValue["SerialConsole"]["ConnectTypesSupported"] = {"IPMI",
                                                                    "SSH"};
-        // TODO (Santosh) : Uncomment when KVM support is in.
-        // res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = true;
-        // res.jsonValue["GraphicalConsole"]["ConnectTypesSupported"] =
-        //    {"KVMIP"};
+#ifdef BMCWEB_ENABLE_KVM
+        res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = true;
+        res.jsonValue["GraphicalConsole"]["ConnectTypesSupported"] = {"KVMIP"};
+#endif // BMCWEB_ENABLE_KVM
 
         res.jsonValue["Links"]["ManagerForServers@odata.count"] = 1;
         res.jsonValue["Links"]["ManagerForServers"] = {