diff --git a/app/components/PaginatedDocumentList.js b/app/components/PaginatedDocumentList.js
index 17cbe5878..aa0f6e2c1 100644
--- a/app/components/PaginatedDocumentList.js
+++ b/app/components/PaginatedDocumentList.js
@@ -74,8 +74,9 @@ class PaginatedDocumentList extends React.Component<Props> {
     const { empty, heading, documents, fetch, options, ...rest } = this.props;
     const showLoading =
       this.isFetching && !this.isFetchingMore && !this.isInitiallyLoaded;
-    const showEmpty = !documents.length || showLoading;
-    const showList = (this.isLoaded || this.isInitiallyLoaded) && !showLoading;
+    const showEmpty = !documents.length && !showLoading;
+    const showList =
+      (this.isLoaded || this.isInitiallyLoaded) && !showLoading && !showEmpty;
 
     return (
       <React.Fragment>