diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0596cee70ed0..9d9db5859e61 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ androidx-exifinterface = '1.3.7'
 androidx-fragment = '1.8.6'
 androidx-lifecycle = '2.8.7'
 androidx-navigation = '2.8.7'
-androidx-paging = '2.1.2'
+androidx-paging = '3.3.6'
 androidx-percentlayout = '1.0.0'
 androidx-preference = '1.2.1'
 androidx-recyclerview = '1.3.2'
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
index cc4062de8070..e4952ddcf5e9 100644
--- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
@@ -9,7 +9,7 @@ import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSo
  *
  * @param createDataSource A function that creates an instance of [InternalPagedListDataSource].
  */
-class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
+class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any>(
     private val createDataSource: () -> InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
 ) : DataSource.Factory<Int, LIST_ITEM>() {
     private var currentSource: PagedListPositionalDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>? = null
@@ -30,7 +30,7 @@ class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_I
  *
  * @param dataSource Describes how to take certain actions such as fetching list for the item type [LIST_ITEM].
  */
-private class PagedListPositionalDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
+private class PagedListPositionalDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any>(
     private val dataSource: InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
 ) : PositionalDataSource<LIST_ITEM>() {
     override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<LIST_ITEM>) {
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
index e4a173b4618f..f17d5792b6ae 100644
--- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
@@ -33,7 +33,7 @@ import kotlin.coroutines.CoroutineContext
  * to either let the user know of each error or present the error in the empty view when it's visible.
  */
 @Suppress("LongParameterList")
-class PagedListWrapper<T>(
+class PagedListWrapper<T : Any>(
     val data: LiveData<PagedList<T>>,
     private val dispatcher: Dispatcher,
     private val listDescriptor: ListDescriptor,
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
index aa7870c0a35d..eba508b1fbc0 100644
--- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
@@ -145,7 +145,7 @@ class ListStore @Inject constructor(
     /**
      * A helper function that creates a [PagedListFactory] for the given [LIST_DESCRIPTOR] and [dataSource].
      */
-    private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM> createPagedListFactory(
+    private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any> createPagedListFactory(
         listDescriptor: LIST_DESCRIPTOR,
         dataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
     ): PagedListFactory<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM> {