diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index a1d7315c899..98c6a3fc001 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -96,13 +96,13 @@ public class DefaultEndPointSelector implements EndPointSelector {
         sbuilder.append(sqlBase);
 
         if (scope.getScopeType() == ScopeType.HOST) {
-            sbuilder.append(" and id = ");
+            sbuilder.append(" and h.id = ");
             sbuilder.append(scope.getScopeId());
         } else if (scope.getScopeType() == ScopeType.CLUSTER) {
-            sbuilder.append(" and cluster_id = ");
+            sbuilder.append(" and h.cluster_id = ");
             sbuilder.append(scope.getScopeId());
         } else if (scope.getScopeType() == ScopeType.ZONE) {
-            sbuilder.append(" and data_center_id = ");
+            sbuilder.append(" and h.data_center_id = ");
             sbuilder.append(scope.getScopeId());
         }
         // TODO: order by rand() is slow if there are lot of hosts