diff --git a/imports/ui/pages/EditDocument/EditDocument.js b/imports/ui/pages/EditDocument/EditDocument.js
index c67c768..cfae309 100644
--- a/imports/ui/pages/EditDocument/EditDocument.js
+++ b/imports/ui/pages/EditDocument/EditDocument.js
@@ -13,8 +13,12 @@ const EditDocument = ({ doc, history }) => (doc ? (
   </div>
 ) : <NotFound />);
 
+EditDocument.defaultProps = {
+  doc: null,
+};
+
 EditDocument.propTypes = {
-  doc: PropTypes.object.isRequired,
+  doc: PropTypes.object,
   history: PropTypes.object.isRequired,
 };
 
diff --git a/imports/ui/pages/ViewDocument/ViewDocument.js b/imports/ui/pages/ViewDocument/ViewDocument.js
index 5cef34d..6c88608 100644
--- a/imports/ui/pages/ViewDocument/ViewDocument.js
+++ b/imports/ui/pages/ViewDocument/ViewDocument.js
@@ -44,7 +44,7 @@ const ViewDocument = ({ loading, doc, match, history }) => (
 
 ViewDocument.propTypes = {
   loading: PropTypes.bool.isRequired,
-  doc: PropTypes.object.isRequired,
+  doc: PropTypes.object,
   match: PropTypes.object.isRequired,
   history: PropTypes.object.isRequired,
 };
@@ -55,6 +55,6 @@ export default createContainer(({ match }) => {
 
   return {
     loading: !subscription.ready(),
-    doc: Documents.findOne(documentId) || {},
+    doc: Documents.findOne(documentId),
   };
 }, ViewDocument);