diff --git a/src/Tree/Controllers/TreeController.cs b/src/Tree/Controllers/TreeController.cs
index fe9c46fb2431a1471a424c5758fbc9ae7324e047..aeae4e251542a021cfb8bdf82029f85c0bf3293e 100644
--- a/src/Tree/Controllers/TreeController.cs
+++ b/src/Tree/Controllers/TreeController.cs
@@ -238,8 +238,8 @@ namespace Coscine.Api.Tree.Controllers
                                 ["Path"] = objectMetaInfoReturnObject.Path,
                                 ["Size"] = objectMetaInfoReturnObject.Size,
                                 ["Kind"] = objectMetaInfoReturnObject.Kind,
-                                ["Modified"] = objectMetaInfoReturnObject.Modified,
-                                ["Created"] = objectMetaInfoReturnObject.Created,
+                                ["Modified"] = x.HasBody ? x.Modified : null,
+                                ["Created"] = x.HasBody ? x.Created : null,
                                 ["Provider"] = objectMetaInfoReturnObject.Provider,
                                 ["IsFolder"] = !x.HasBody,
                                 ["IsFile"] = x.HasBody,