diff --git a/app/views/documents/_document.json.jbuilder b/app/views/documents/_document.json.jbuilder
index a34f50f3..26098606 100644
--- a/app/views/documents/_document.json.jbuilder
+++ b/app/views/documents/_document.json.jbuilder
@@ -3,7 +3,9 @@ json.set! :creator do
   json.extract! document.user, :id, :name
 end
 json.set! :project do
-  json.extract! document.project, :id, :name
+  if document.project
+    json.extract! document.project, :id, :name
+  end
 end
 json.set! :tags do
   json.array! document.tags, :id, :name
diff --git a/app/views/tasks/_task.json.jbuilder b/app/views/tasks/_task.json.jbuilder
index ea51d545..ca3522c4 100644
--- a/app/views/tasks/_task.json.jbuilder
+++ b/app/views/tasks/_task.json.jbuilder
@@ -6,7 +6,9 @@ json.set! :assigner do
   json.extract! task.assigner, :id, :name
 end
 json.set! :project do
-  json.extract! task.project, :id, :name
+  if task.project
+    json.extract! task.project, :id, :name
+  end
 end
 json.set! :tags do
   json.array! task.tags, :id, :name