diff --git a/src/lifecycle.js b/src/lifecycle.js
index 345bec4..ebae901 100644
--- a/src/lifecycle.js
+++ b/src/lifecycle.js
@@ -88,7 +88,8 @@ export default Base =>
             this.props.collapseOnSortingChange) ||
           oldState.filtered !== newResolvedState.filtered ||
           oldState.showFilters !== newResolvedState.showFilters ||
-          (!newResolvedState.frozen &&
+          (oldState.sortedData &&
+            !newResolvedState.frozen &&
             oldState.resolvedData !== newResolvedState.resolvedData &&
             this.props.collapseOnDataChange)
         ) {