diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d7f883b374fdffdfefbfd0bc73d63871139e4515..98b255a2ef8134d0e1953b81bf7521021f13efcd 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2331,7 +2331,8 @@ class LUQueryClusterInfo(NoHooksLU):
       "master": cluster.master_node,
       "default_hypervisor": cluster.default_hypervisor,
       "enabled_hypervisors": cluster.enabled_hypervisors,
-      "hvparams": cluster.hvparams,
+      "hvparams": dict([(hypervisor, cluster.hvparams[hypervisor])
+                        for hypervisor in cluster.enabled_hypervisors]),
       "beparams": cluster.beparams,
       "candidate_pool_size": cluster.candidate_pool_size,
       }