diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index eea194bbc52..3dc5ac081e0 100644
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -357,7 +357,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
             bareMetalParams.put("cpuCapacity", cpuSpeed.toString());
             bareMetalParams.put("memCapacity", memCapacity.toString());
             bareMetalParams.put("mac", mac);
-            if (hostTags != null) {
+            if (hostTags != null && hostTags.size() > 0) {
                 bareMetalParams.put("hostTag", hostTags.get(0));
             }
         }