diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java
index bad821e5016..9e6b76e467f 100644
--- a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java
@@ -26,19 +26,19 @@ public class UploadStatusCommand extends Command {
         Volume,
         Template
     }
-    private long entityId;
+    private String entityUuid;
     private EntityType entityType;
 
     protected UploadStatusCommand() {
     }
 
-    public UploadStatusCommand(long entityId, EntityType entityType) {
-        this.entityId = entityId;
+    public UploadStatusCommand(String entityUuid, EntityType entityType) {
+        this.entityUuid = entityUuid;
         this.entityType = entityType;
     }
 
-    public long getEntityId() {
-        return entityId;
+    public String getEntityUuid() {
+        return entityUuid;
     }
 
     public EntityType getEntityType() {
diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
index 6a27f2945ff..d87fe607d52 100755
--- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -190,7 +190,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
                     continue;
                 }
                 Host host = _hostDao.findById(ep.getId());
-                UploadStatusCommand cmd = new UploadStatusCommand(volume.getId(), EntityType.Volume);
+                UploadStatusCommand cmd = new UploadStatusCommand(volume.getUuid(), EntityType.Volume);
                 if (host != null && host.getManagementServerId() != null) {
                     if (_nodeId == host.getManagementServerId().longValue()) {
                         Answer answer = null;
@@ -227,7 +227,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
                     continue;
                 }
                 Host host = _hostDao.findById(ep.getId());
-                UploadStatusCommand cmd = new UploadStatusCommand(template.getId(), EntityType.Template);
+                UploadStatusCommand cmd = new UploadStatusCommand(template.getUuid(), EntityType.Template);
                 if (host != null && host.getManagementServerId() != null) {
                     if (_nodeId == host.getManagementServerId().longValue()) {
                         Answer answer = null;