diff --git a/src/Project/Controllers/ProjectController.cs b/src/Project/Controllers/ProjectController.cs
index a240af3a9332b70d57f30ba518e50f7b7cac6045..06bebe4bea0839f4da3d295e76d977037d0ff4ea 100644
--- a/src/Project/Controllers/ProjectController.cs
+++ b/src/Project/Controllers/ProjectController.cs
@@ -198,16 +198,16 @@ namespace Coscine.Api.Project.Controllers
             var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled);
 
             return Json(resourceTypes.Select(x => 
-            {                
+            {
+                var projectQuota = _projectQuotaModel.GetWhere((y) =>
+                        y.ProjectId == projectGuid &&
+                        y.ResourceTypeId == x.Id);
                 return new ProjectQuotaReturnObject
                 {
                     Id = x.Id,
                     Name = x.DisplayName,
                     Used = CalculateUsed(x, projectGuid),
-                    Allocated = _projectQuotaModel.GetWhere((y) =>
-                        y.ProjectId == projectGuid &&
-                        y.ResourceTypeId == x.Id)
-                    .Quota
+                    Allocated = projectQuota == null ? 0 : projectQuota.Quota
                 };
             }));
         }