diff --git a/Source/IGListKit/IGListCollectionViewLayout.mm b/Source/IGListKit/IGListCollectionViewLayout.mm
index 534f60025..98d30279a 100644
--- a/Source/IGListKit/IGListCollectionViewLayout.mm
+++ b/Source/IGListKit/IGListCollectionViewLayout.mm
@@ -389,12 +389,10 @@ - (void)invalidateLayoutWithContext:(IGListCollectionViewLayoutInvalidationConte
 
     if (hasInvalidatedItemIndexPaths
         || [context invalidateEverything]
+        || ([context invalidateDataSourceCounts] && _minimumInvalidatedSection == NSNotFound) // if count changed and we don't have information on the minimum invalidated section
         || context.ig_invalidateAllAttributes) {
         // invalidates all
         _minimumInvalidatedSection = 0;
-    } else if ([context invalidateDataSourceCounts] && _minimumInvalidatedSection == NSNotFound) {
-        // invalidate all if count changed and we don't have information on the minimum invalidated section
-        _minimumInvalidatedSection = 0;
     }
 
     if (context.ig_invalidateSupplementaryAttributes) {