diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index d21f67b25..ba1946d0f 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -365,7 +365,7 @@
 		DB6D9F3526351B7A008423CD /* NotificationService+Decrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F3426351B7A008423CD /* NotificationService+Decrypt.swift */; };
 		DB72601C25E36A2100235243 /* MastodonServerRulesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB72601B25E36A2100235243 /* MastodonServerRulesViewController.swift */; };
 		DB72602725E36A6F00235243 /* MastodonServerRulesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB72602625E36A6F00235243 /* MastodonServerRulesViewModel.swift */; };
-		DB7274F4273BB9B200577D95 /* ListBatchFetchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB7274F3273BB9B200577D95 /* ListBatchFetchViewModel.swift */; };
+		DB7274F4273BB9B200577D95 /* UIScrollViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB7274F3273BB9B200577D95 /* UIScrollViewDelegate.swift */; };
 		DB73B490261F030A002E9E9F /* SafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB73B48F261F030A002E9E9F /* SafariActivity.swift */; };
 		DB75BF1E263C1C1B00EDBF1F /* CustomScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB75BF1D263C1C1B00EDBF1F /* CustomScheduler.swift */; };
 		DB789A0B25F9F2950071ACA0 /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB789A0A25F9F2950071ACA0 /* ComposeViewController.swift */; };
@@ -1045,7 +1045,7 @@
 		DB6D9F3426351B7A008423CD /* NotificationService+Decrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationService+Decrypt.swift"; sourceTree = "<group>"; };
 		DB72601B25E36A2100235243 /* MastodonServerRulesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonServerRulesViewController.swift; sourceTree = "<group>"; };
 		DB72602625E36A6F00235243 /* MastodonServerRulesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonServerRulesViewModel.swift; sourceTree = "<group>"; };
-		DB7274F3273BB9B200577D95 /* ListBatchFetchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListBatchFetchViewModel.swift; sourceTree = "<group>"; };
+		DB7274F3273BB9B200577D95 /* UIScrollViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIScrollViewDelegate.swift; sourceTree = "<group>"; };
 		DB73B48F261F030A002E9E9F /* SafariActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariActivity.swift; sourceTree = "<group>"; };
 		DB75BF1D263C1C1B00EDBF1F /* CustomScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomScheduler.swift; sourceTree = "<group>"; };
 		DB789A0A25F9F2950071ACA0 /* ComposeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewController.swift; sourceTree = "<group>"; };
@@ -2524,27 +2524,28 @@
 			children = (
 				2A82294E29262EE000D2A1F7 /* AppContext+NextAccount.swift */,
 				5DF1056325F887CB00D6C0D4 /* AVPlayer.swift */,
+				2A1FE47D2938C11200784BF1 /* Collection+IsNotEmpty.swift */,
 				2D206B8525F5FB0900143C56 /* Double.swift */,
 				DBB3BA2926A81C020004F2D4 /* FLAnimatedImageView.swift */,
 				DB68586325E619B700F0A850 /* NSKeyValueObservation.swift */,
 				2D939AB425EDD8A90076FA61 /* String.swift */,
-				DB68A06225E905E000CFDF14 /* UIApplication.swift */,
 				DB45FAB525CA5485005A8AC7 /* UIAlertController.swift */,
+				DB68A06225E905E000CFDF14 /* UIApplication.swift */,
 				DB45FAD625CA6C76005A8AC7 /* UIBarButtonItem.swift */,
+				2D206B9125F60EA700143C56 /* UIControl.swift */,
+				0FAA101B25E10E760017CCDE /* UIFont.swift */,
+				2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */,
+				855149C7295F1C5F00943D96 /* UIInterfaceOrientationMask.swift */,
+				DB9E0D6E25EE008500CFDD76 /* UIInterpolatingMotionEffect.swift */,
+				2D84350425FF858100EECE90 /* UIScrollView.swift */,
+				DB7274F3273BB9B200577D95 /* UIScrollViewDelegate.swift */,
+				DBCC3B2F261440A50045B23D /* UITabBarController.swift */,
 				DB4481B825EE289600BEFB67 /* UITableView.swift */,
 				DBD376B1269302A4007FEC24 /* UITableViewCell.swift */,
-				0FAA101B25E10E760017CCDE /* UIFont.swift */,
-				2D206B9125F60EA700143C56 /* UIControl.swift */,
-				5DA732CB2629CEF500A92342 /* UIView+Remove.swift */,
-				2D24E1222626ED9D00A59D4F /* UIView+Gesture.swift */,
-				DB8AF55C25C138B7002E6C99 /* UIViewController.swift */,
 				2D3F9E0325DFA133004262D9 /* UITapGestureRecognizer.swift */,
-				2D84350425FF858100EECE90 /* UIScrollView.swift */,
-				DB9E0D6E25EE008500CFDD76 /* UIInterpolatingMotionEffect.swift */,
-				2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */,
-				DBCC3B2F261440A50045B23D /* UITabBarController.swift */,
-				2A1FE47D2938C11200784BF1 /* Collection+IsNotEmpty.swift */,
-				855149C7295F1C5F00943D96 /* UIInterfaceOrientationMask.swift */,
+				2D24E1222626ED9D00A59D4F /* UIView+Gesture.swift */,
+				5DA732CB2629CEF500A92342 /* UIView+Remove.swift */,
+				DB8AF55C25C138B7002E6C99 /* UIViewController.swift */,
 			);
 			path = Extension;
 			sourceTree = "<group>";
@@ -2676,7 +2677,6 @@
 		DB9D6C2025E502C60051B173 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
-				DB7274F3273BB9B200577D95 /* ListBatchFetchViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -3663,7 +3663,7 @@
 				DBB45B5927B39FE4002DC5A7 /* MediaPreviewVideoViewModel.swift in Sources */,
 				DB0FCB76279571C5006C02E2 /* ThreadViewController+DataSourceProvider.swift in Sources */,
 				DB1E346825F518E20079D7DF /* CategoryPickerSection.swift in Sources */,
-				DB7274F4273BB9B200577D95 /* ListBatchFetchViewModel.swift in Sources */,
+				DB7274F4273BB9B200577D95 /* UIScrollViewDelegate.swift in Sources */,
 				DB0618052785A73D0030EE79 /* RegisterItem.swift in Sources */,
 				DB6B74EF272FB55000C70B6E /* FollowerListViewController.swift in Sources */,
 				DB4AA6B327BA34B6009EC082 /* CellFrameCacheContainer.swift in Sources */,
diff --git a/Mastodon/Scene/Share/ViewModel/ListBatchFetchViewModel.swift b/Mastodon/Extension/UIScrollViewDelegate.swift
similarity index 79%
rename from Mastodon/Scene/Share/ViewModel/ListBatchFetchViewModel.swift
rename to Mastodon/Extension/UIScrollViewDelegate.swift
index 066f9dd62..7e289dee4 100644
--- a/Mastodon/Scene/Share/ViewModel/ListBatchFetchViewModel.swift
+++ b/Mastodon/Extension/UIScrollViewDelegate.swift
@@ -1,13 +1,8 @@
-//
-//  ListBatchFetchViewModel.swift
-//  Mastodon
-//
-//  Created by Cirno MainasuK on 2021-11-10.
-//
+// Copyright © 2024 Mastodon gGmbH. All rights reserved.
 
 import UIKit
 
-final class ListBatchFetchViewModel {
+extension UIScrollViewDelegate {
     static func scrollViewDidScrollToEnd(_ scrollView: UIScrollView, action: () -> Void) {
         if scrollView.isDragging || scrollView.isTracking { return }
 
diff --git a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift
index 59b27c46f..bc09ad2f2 100644
--- a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift
+++ b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift
@@ -199,7 +199,7 @@ extension DiscoveryNewsViewController: TableViewControllerNavigateable {
 
 extension DiscoveryNewsViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(DiscoveryNewsViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel.swift b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel.swift
index 52061d5ae..5f5546945 100644
--- a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel.swift
+++ b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel.swift
@@ -20,7 +20,6 @@ final class DiscoveryNewsViewModel {
     // input
     let context: AppContext
     let authContext: AuthContext
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     // output
     @Published var links: [Mastodon.Entity.Link] = []
diff --git a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift
index 309e4580d..3a2a96204 100644
--- a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift
+++ b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift
@@ -165,7 +165,7 @@ extension DiscoveryPostsViewController: StatusTableViewControllerNavigateable {
 
 extension DiscoveryPostsViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(DiscoveryPostsViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift
index 47f695987..3405c3456 100644
--- a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift
+++ b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift
@@ -21,7 +21,6 @@ final class DiscoveryPostsViewModel {
     let context: AppContext
     let authContext: AuthContext
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
     
     // output
     var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>?
diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
index 7afcd466c..ab7755b3b 100644
--- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
+++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift
@@ -252,7 +252,7 @@ extension HashtagTimelineViewController: StatusTableViewControllerNavigateable {
 
 extension HashtagTimelineViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(HashtagTimelineViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift
index 4635ee503..8e93f0817 100644
--- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift
+++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift
@@ -28,7 +28,6 @@ final class HashtagTimelineViewModel {
     let isFetchingLatestTimeline = CurrentValueSubject<Bool, Never>(false)
     let timelinePredicate = CurrentValueSubject<NSPredicate?, Never>(nil)
     let hashtagEntity = CurrentValueSubject<Mastodon.Entity.Tag?, Never>(nil)
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     // output
     var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>?
diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
index 4881f2f11..e6563f26a 100644
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
+++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
@@ -25,7 +25,6 @@ final class HomeTimelineViewModel: NSObject {
     let context: AppContext
     let authContext: AuthContext
     let dataController: FeedDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     var presentedSuggestions = false
 
diff --git a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift
index 2b7483368..cd8a3158e 100644
--- a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift
+++ b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift
@@ -301,7 +301,7 @@ extension NotificationTimelineViewController: TableViewControllerNavigateable {
 
 extension NotificationTimelineViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.loadOldestStateMachine.enter(NotificationTimelineViewModel.LoadOldestState.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
index c2ac144f8..0df34434a 100644
--- a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
+++ b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
@@ -21,7 +21,6 @@ final class NotificationTimelineViewModel {
     let authContext: AuthContext
     let scope: Scope
     let dataController: FeedDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
     @Published var isLoadingLatest = false
     @Published var lastAutomaticFetchTimestamp: Date?
     
diff --git a/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift b/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift
index a9fa0b750..64f8b3151 100644
--- a/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift
+++ b/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift
@@ -126,7 +126,7 @@ extension BookmarkViewController: StatusTableViewControllerNavigateable {
 
 extension BookmarkViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             print("See me loading \(Date())")
             viewModel.stateMachine.enter(BookmarkViewModel.State.Loading.self)
         }
diff --git a/Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift b/Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift
index 420f0f94f..087dacfa0 100644
--- a/Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift
+++ b/Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift
@@ -21,7 +21,6 @@ final class BookmarkViewModel {
     let authContext: AuthContext
     
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     // output
     var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>?
diff --git a/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift b/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift
index a6162e99c..732281026 100644
--- a/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift
+++ b/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift
@@ -136,7 +136,7 @@ extension FavoriteViewController: StatusTableViewControllerNavigateable {
 
 extension FavoriteViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(FavoriteViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift b/Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift
index 8e86b0256..6591c8312 100644
--- a/Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift
+++ b/Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift
@@ -20,7 +20,6 @@ final class FavoriteViewModel {
     let context: AppContext
     let authContext: AuthContext
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     // output
     var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>?
diff --git a/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift b/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift
index 0b9ddd637..9eca1848b 100644
--- a/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift
+++ b/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift
@@ -159,7 +159,7 @@ extension FollowerListViewController: DataSourceProvider {
 
 extension FollowerListViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(FollowerListViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift b/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift
index 49c3bc2ec..bbbe4db4a 100644
--- a/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift
+++ b/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift
@@ -162,7 +162,7 @@ extension UserTimelineViewController: IndicatorInfoProvider {
 //MARK: - UIScrollViewDelegate
 extension UserTimelineViewController: UIScrollViewDelegate {
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(UserTimelineViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift b/Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift
index 8598aafb9..bc59c592f 100644
--- a/Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift
+++ b/Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift
@@ -22,7 +22,6 @@ final class UserTimelineViewModel {
     let authContext: AuthContext
     let title: String
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
     @Published var userIdentifier: UserIdentifier?
     @Published var queryFilter: QueryFilter
 
diff --git a/Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController.swift b/Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController.swift
index 556b90f14..4ac76ea09 100644
--- a/Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController.swift
+++ b/Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController.swift
@@ -86,7 +86,7 @@ extension FavoritedByViewController: UserTableViewCellDelegate {}
 
 extension FavoritedByViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(UserListViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController.swift b/Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController.swift
index 432cf2336..30c0a72d6 100644
--- a/Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController.swift
+++ b/Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController.swift
@@ -93,7 +93,7 @@ extension RebloggedByViewController: UserTableViewCellDelegate {}
 
 extension RebloggedByViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(UserListViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Profile/UserList/UserListViewModel.swift b/Mastodon/Scene/Profile/UserList/UserListViewModel.swift
index 14665334a..dc65bf4d1 100644
--- a/Mastodon/Scene/Profile/UserList/UserListViewModel.swift
+++ b/Mastodon/Scene/Profile/UserList/UserListViewModel.swift
@@ -21,7 +21,6 @@ final class UserListViewModel {
     let kind: Kind
     @Published var accounts: [Mastodon.Entity.Account]
     @Published var relationships: [Mastodon.Entity.Relationship]
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     // output
     var diffableDataSource: UITableViewDiffableDataSource<UserSection, UserItem>!
diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
index 9af01024f..e928c59cf 100644
--- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
+++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
@@ -191,7 +191,7 @@ extension ReportStatusViewController: UIAdaptivePresentationControllerDelegate {
 
 extension ReportStatusViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(ReportStatusViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
index 030b81771..9e7b28e06 100644
--- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
+++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
@@ -27,7 +27,6 @@ class ReportStatusViewModel {
     let account: Mastodon.Entity.Account
     let status: MastodonStatus?
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     @Published var isSkip = false
     @Published var selectStatuses = OrderedSet<MastodonStatus>()
diff --git a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift
index 06e63c1e1..37a3e297e 100644
--- a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift
+++ b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift
@@ -98,7 +98,7 @@ extension SearchResultViewController: UserTableViewCellDelegate {}
 
 extension SearchResultViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        ListBatchFetchViewModel.scrollViewDidScrollToEnd(scrollView) {
+        Self.scrollViewDidScrollToEnd(scrollView) {
             viewModel.stateMachine.enter(SearchResultViewModel.State.Loading.self)
         }
     }
diff --git a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift
index 34b4f4299..6af3b0dcd 100644
--- a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift
+++ b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift
@@ -25,7 +25,6 @@ final class SearchResultViewModel {
     @Published var accounts: [Mastodon.Entity.Account] = []
     var relationships: [Mastodon.Entity.Relationship] = []
     let dataController: StatusDataController
-    let listBatchFetchViewModel = ListBatchFetchViewModel()
 
     var cellFrameCache = NSCache<NSNumber, NSValue>()
     var navigationBarFrame = CurrentValueSubject<CGRect, Never>(.zero)