diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
index 8647e9681272..a8d1af62f531 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
@@ -277,7 +277,7 @@ public void setSize(Long size) {
     }
 
     public long getSize() {
-        return size;
+        return size == null ? 0l : size.longValue();
     }
 
     public void setPhysicalSize(long physicalSize) {