diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 97a1ff27cb0..68a578fd218 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -91,7 +91,11 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
             volResponse.setVirtualMachineId(volume.getVmUuid());
             volResponse.setVirtualMachineName(volume.getVmName());
             volResponse.setVirtualMachineState(volume.getVmState().toString());
-            volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
+            if (volume.getVmDisplayName() != null) {
+                volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
+            } else {
+                volResponse.setVirtualMachineDisplayName(volume.getVmName());
+            }
         }
 
         volResponse.setProvisioningType(volume.getProvisioningType().toString());