diff --git a/src/components/DocumentList/DocumentList.js b/src/components/DocumentList/DocumentList.js
index 61ebc0692..2c9e83fe3 100644
--- a/src/components/DocumentList/DocumentList.js
+++ b/src/components/DocumentList/DocumentList.js
@@ -13,7 +13,7 @@ class DocumentList extends React.Component {
   render() {
     return (
       <div>
-        { this.props.documents.map((document) => {
+        { this.props.documents && this.props.documents.map((document) => {
           return (
             <div>
               <DocumentPreview document={ document } />
diff --git a/src/scenes/Dashboard/Dashboard.js b/src/scenes/Dashboard/Dashboard.js
index 20cf3e8e4..e8d801019 100644
--- a/src/scenes/Dashboard/Dashboard.js
+++ b/src/scenes/Dashboard/Dashboard.js
@@ -56,7 +56,11 @@ class Dashboard extends React.Component {
         >
           <CenteredContent>
             <Flex direction="column" flex={ true }>
-
+              { store.isFetching ? (
+                <AtlasPreviewLoading />
+              ) : store.atlases && store.atlases.map((atlas) => {
+               return  (<AtlasPreview key={ atlas.id } data={ atlas } />);
+              }) }
             </Flex>
           </CenteredContent>
         </Layout>