diff --git a/dist/dataset.js b/dist/dataset.js
index 109978d..4d00ad4 100644
--- a/dist/dataset.js
+++ b/dist/dataset.js
@@ -35,7 +35,7 @@ define(["require", "exports", "knockout", "underscore", "promise/extensions", ".
 
     function _updateDataSet(dataset, result, query) {
         var rmDfd, isArray = _.isArray(result.data);
-        if (isArray && !query || query.pageSize() === 0) {
+        if (isArray && !query || query && query.pageSize() === 0) {
             var current = dataset.toArray();
             if (query && query.filters.size() > 0)
                 current = query.applyFilters(current);
diff --git a/src/dataset.ts b/src/dataset.ts
index dc54d82..2793864 100644
--- a/src/dataset.ts
+++ b/src/dataset.ts
@@ -202,7 +202,7 @@ function _initAttachedEntity(dataset: DataSet<any, any>, entity: any): any {
 
 function _updateDataSet(dataset: DataSet<any, any>, result: adapters.IAdapterResult, query: query.ODataQuery): Promise<any[]> {
     var rmDfd, isArray = _.isArray(result.data);
-    if (isArray && !query || query.pageSize() === 0) {
+    if (isArray && !query || query && query.pageSize() === 0) {
         var current = dataset.toArray();
         if (query && query.filters.size() > 0)
             current = query.applyFilters(current);