diff --git a/src/client/selectors/index.js b/src/client/selectors/index.js
index 8a9a7d78fc797720d0119a3144ff4c9e0290c3b3..2538cdfad84445bee70261f094c0a87f5b16f7bc 100644
--- a/src/client/selectors/index.js
+++ b/src/client/selectors/index.js
@@ -12,6 +12,13 @@ const getSortDirection = state => state.sortDirection
 export const filterResults = createSelector(
   [getResults, getFacets, getLastlyUpdatedFacet, getSortBy, getSortDirection],
   (results, facets, lastlyUpdatedFacet, sortBy, sortDirection) => {
+    if (results == null) {
+      return {
+        clientFSResults: null,
+        clientFSFacetValues: null
+      }
+    }
+
     // Filter results by current facet selections
     Object.values(facets).forEach(facet => {
       const { facetID, filterType } = facet