diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e9f142f90b5d..c63110e38867 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 18.4
 -----
-
+* [*] Fixed an issue where images point to local URLs in the editor when saving a post with ongoing uploads. [#17157]
 
 18.3
 -----
diff --git a/WordPress/Classes/Services/PostCoordinator.swift b/WordPress/Classes/Services/PostCoordinator.swift
index 3ea03bd9cb58..494a38d85783 100644
--- a/WordPress/Classes/Services/PostCoordinator.swift
+++ b/WordPress/Classes/Services/PostCoordinator.swift
@@ -137,6 +137,13 @@ class PostCoordinator: NSObject {
                 return
             }
 
+            // Ensure that all synced media references are up to date
+            post.media.forEach { media in
+                if media.remoteStatus == .sync {
+                    self.updateReferences(to: media, in: post)
+                }
+            }
+
             let uuid = observeMedia(for: post, completion: completion)
             trackObserver(receipt: uuid, for: post)