diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 88af6e9aa85..5654c5764d1 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -3097,7 +3097,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         Integer maxDataVolumesSupported = null;
         if (host != null) {
             _hostDao.loadDetails(host);
-            maxDataVolumesSupported = _hypervisorCapabilitiesDao.getMaxDataVolumesLimit(host.getHypervisorType(), host.getDetail("product_version"));
+            String hypervisorVersion = host.getDetail("product_version");
+            if (org.apache.commons.lang.StringUtils.isBlank(hypervisorVersion)) {
+                hypervisorVersion = host.getHypervisorVersion();
+            }
+            maxDataVolumesSupported = _hypervisorCapabilitiesDao.getMaxDataVolumesLimit(host.getHypervisorType(), hypervisorVersion);
         } else {
             HypervisorType hypervisorType = vm.getHypervisorType();
             if (hypervisorType != null && CollectionUtils.isNotEmpty(supportingDefaultHV) && supportingDefaultHV.contains(hypervisorType)) {