diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
index 31454c6b562e..ffd95cb75b3b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
@@ -272,7 +272,7 @@ class PostListMainViewModel @Inject constructor(
                 site = site,
                 postListType = postListType,
                 postActionHandler = postActionHandler,
-                getUploadStatus = uploadStatusTracker::getUploadStatus,
+                uploadStatusTracker = uploadStatusTracker,
                 doesPostHaveUnhandledConflict = postConflictResolver::doesPostHaveUnhandledConflict,
                 hasAutoSave = postConflictResolver::hasUnhandledAutoSave,
                 postFetcher = postFetcher,
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
index cf39cc77c68c..f9d13505a95d 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
@@ -33,7 +33,6 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.AuthorFilterSelection.EVERYONE
 import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
 import org.wordpress.android.ui.posts.PostListType.SEARCH
-import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
 import org.wordpress.android.ui.posts.PostUtils
 import org.wordpress.android.ui.posts.trackPostListAction
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
@@ -70,7 +69,6 @@ class PostListViewModel @Inject constructor(
     private val uploadStarter: UploadStarter,
     private val readerUtilsWrapper: ReaderUtilsWrapper,
     private val uploadUtilsWrapper: UploadUtilsWrapper,
-    private val uploadStatusTracker: PostModelUploadStatusTracker,
     @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     connectionStatus: LiveData<ConnectionStatus>
@@ -373,7 +371,7 @@ class PostListViewModel @Inject constructor(
                         trackPostListAction(connector.site, buttonType, postModel, statEvent)
                         connector.postActionHandler.handlePostButton(buttonType, postModel)
                     },
-                    uploadStatusTracker = uploadStatusTracker
+                    uploadStatusTracker = connector.uploadStatusTracker
             )
 
     private fun retryOnConnectionAvailableAfterRefreshError() {
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModelConnector.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModelConnector.kt
index 682d6207ecf7..58ee703ad99b 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModelConnector.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModelConnector.kt
@@ -4,15 +4,16 @@ import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.posts.PostActionHandler
 import org.wordpress.android.ui.posts.PostListType
+import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
 
 class PostListViewModelConnector(
     val site: SiteModel,
     val postListType: PostListType,
     val postActionHandler: PostActionHandler,
-    val getUploadStatus: (PostModel, SiteModel) -> PostListItemUploadStatus,
     val doesPostHaveUnhandledConflict: (PostModel) -> Boolean,
     val hasAutoSave: (PostModel) -> Boolean,
     val postFetcher: PostFetcher,
+    val uploadStatusTracker: PostModelUploadStatusTracker,
     private val getFeaturedImageUrl: (site: SiteModel, featuredImageId: Long) -> String?
 ) {
     fun getFeaturedImageUrl(featuredImageId: Long): String? {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/AutoSavePostIfNotDraftUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/AutoSavePostIfNotDraftUseCaseTest.kt
index 1da553ebc67f..9283b7f3b7d9 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/AutoSavePostIfNotDraftUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/AutoSavePostIfNotDraftUseCaseTest.kt
@@ -160,7 +160,7 @@ class AutoSavePostIfNotDraftUseCaseTest {
     }
 
     private fun createOnPostChangedEvent(post: PostModel, error: PostError? = null): OnPostChanged {
-        val event = OnPostChanged(CauseOfOnPostChanged.RemoteAutoSavePost(post.id), 0)
+        val event = OnPostChanged(CauseOfOnPostChanged.RemoteAutoSavePost(post.id, post.remotePostId), 0)
         error?.let { event.error = it }
         return event
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListViewModelTest.kt
index a12f01fafe19..95a64431d97b 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListViewModelTest.kt
@@ -21,7 +21,6 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.PostListType
 import org.wordpress.android.ui.posts.PostListType.DRAFTS
 import org.wordpress.android.ui.posts.PostListType.SEARCH
-import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
 import org.wordpress.android.ui.uploads.UploadStarter
 
 private const val DEFAULT_PHOTON_DIMENSIONS = -9
@@ -30,7 +29,6 @@ private val DEFAULT_AUTHOR_FILTER = AuthorFilterSelection.EVERYONE
 class PostListViewModelTest : BaseUnitTest() {
     @Mock private lateinit var site: SiteModel
     @Mock private lateinit var uploadStarter: UploadStarter
-    @Mock private lateinit var uploadStatusTracker: PostModelUploadStatusTracker
 
     private lateinit var viewModel: PostListViewModel
 
@@ -63,8 +61,7 @@ class PostListViewModelTest : BaseUnitTest() {
                 connectionStatus = mock(),
                 uploadUtilsWrapper = mock(),
                 uiDispatcher = TEST_DISPATCHER,
-                bgDispatcher = TEST_DISPATCHER,
-                uploadStatusTracker = uploadStatusTracker
+                bgDispatcher = TEST_DISPATCHER
         )
     }
 
@@ -110,7 +107,7 @@ class PostListViewModelTest : BaseUnitTest() {
                 site = site,
                 postListType = postListType,
                 postActionHandler = mock(),
-                getUploadStatus = mock(),
+                uploadStatusTracker = mock(),
                 doesPostHaveUnhandledConflict = mock(),
                 hasAutoSave = mock(),
                 getFeaturedImageUrl = mock(),