diff --git a/Source/ASCollectionView.mm b/Source/ASCollectionView.mm
index 70dff45aab..ef9df71a5c 100644
--- a/Source/ASCollectionView.mm
+++ b/Source/ASCollectionView.mm
@@ -1587,7 +1587,9 @@ static NSString * const kReuseIdentifier = @"_ASCollectionReuseIdentifier";
 {
   if (_leadingScreensForBatching != leadingScreensForBatching) {
     _leadingScreensForBatching = leadingScreensForBatching;
-    [self _checkForBatchFetching];
+    ASPerformBlockOnMainThread(^{
+      [self _checkForBatchFetching];
+    });
   }
 }
 
diff --git a/Source/ASTableView.mm b/Source/ASTableView.mm
index 4606726f23..1458a47810 100644
--- a/Source/ASTableView.mm
+++ b/Source/ASTableView.mm
@@ -1318,7 +1318,12 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
 
 - (void)setLeadingScreensForBatching:(CGFloat)leadingScreensForBatching
 {
-  _leadingScreensForBatching = leadingScreensForBatching;
+  if (_leadingScreensForBatching != leadingScreensForBatching) {
+    _leadingScreensForBatching = leadingScreensForBatching;
+    ASPerformBlockOnMainThread(^{
+      [self _checkForBatchFetching];
+    });
+  }
 }
 
 - (BOOL)automaticallyAdjustsContentOffset