diff --git a/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt
index 37e2fe49dd87..9ea1eb5a53b6 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt
@@ -61,7 +61,7 @@ class PostMediaHandlerTest {
         verify(dispatcher).dispatch(any())
         assertThat(actions).hasSize(1)
         val emittedAction = actions.last()
-        assertThat(emittedAction.payload.media.postId).isEqualTo(updatedPostId)
+        assertThat(emittedAction.payload.media?.postId).isEqualTo(updatedPostId)
         assertThat(emittedAction.payload.site).isEqualTo(site)
     }
 
@@ -83,12 +83,12 @@ class PostMediaHandlerTest {
         verify(dispatcher, times(2)).dispatch(any())
         assertThat(actions).hasSize(2)
         val firstAction = actions[0]
-        assertThat(firstAction.payload.media.mediaId).isEqualTo(firstMediaItem.mediaId)
-        assertThat(firstAction.payload.media.postId).isEqualTo(updatedPostId)
+        assertThat(firstAction.payload.media?.mediaId).isEqualTo(firstMediaItem.mediaId)
+        assertThat(firstAction.payload.media?.postId).isEqualTo(updatedPostId)
         assertThat(firstAction.payload.site).isEqualTo(site)
         val secondAction = actions[1]
-        assertThat(secondAction.payload.media.mediaId).isEqualTo(secondMediaItem.mediaId)
-        assertThat(secondAction.payload.media.postId).isEqualTo(updatedPostId)
+        assertThat(secondAction.payload.media?.mediaId).isEqualTo(secondMediaItem.mediaId)
+        assertThat(secondAction.payload.media?.postId).isEqualTo(updatedPostId)
         assertThat(secondAction.payload.site).isEqualTo(site)
     }
 
diff --git a/build.gradle b/build.gradle
index 27d2e78dc0c4..0e17e0fa1a37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ ext {
     automatticTracksVersion = '3.3.0'
     gutenbergMobileVersion = 'v1.107.0'
     wordPressAztecVersion = 'v1.8.0'
-    wordPressFluxCVersion = 'trunk-5f7448d86213648f402c2e04af738ec5904ebb31'
+    wordPressFluxCVersion = 'trunk-b85a542abce556295bb4afc44e553bc2a395c3b4'
     wordPressLoginVersion = '1.6.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.10.0'