diff --git a/src/datastore/DatastorePool.cc b/src/datastore/DatastorePool.cc
index affd7d1f30..f1382ad658 100644
--- a/src/datastore/DatastorePool.cc
+++ b/src/datastore/DatastorePool.cc
@@ -274,6 +274,9 @@ int DatastorePool::drop(PoolObjectSQL * objsql, string& error_msg)
     return rc;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int DatastorePool::disk_attribute(int ds_id, VectorAttribute * disk)
 {
     Datastore * ds = get(ds_id, true);
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index d0285d0b1e..29006777e0 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3677,7 +3677,10 @@ bool VirtualMachine::volatile_disk_extended_info(Template *tmpl)
 
         found = true;
 
-        ds_pool->disk_attribute(get_ds_id(), disk);
+        if (hasHistory())
+        {
+            ds_pool->disk_attribute(get_ds_id(), disk);
+        }
     }
 
     return found;