diff --git a/src/bloodhound/search_index.js b/src/bloodhound/search_index.js
index 0577c4fbf2..712de9ff02 100644
--- a/src/bloodhound/search_index.js
+++ b/src/bloodhound/search_index.js
@@ -103,6 +103,13 @@ var SearchIndex = window.SearchIndex = (function() {
           }
         }
       });
+      
+      if (!query) {
+        matches = [];
+        for (var obj in that.datums) {
+          matches.push(obj);
+        }
+      }
 
       return matches ?
         _.map(unique(matches), function(id) { return that.datums[id]; }) : [];