diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
index 75963550f770..a9006e5e6321 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
@@ -78,7 +78,11 @@ final class GutenbergMediaPickerHelper: NSObject {
         assert(Thread.isMainThread, "mapMediaIdsToMedia should only be called on the main thread")
         let context = ContextManager.shared.mainContext
         let request = NSFetchRequest<NSManagedObject>(entityName: "Media")
-        request.predicate = NSPredicate(format: "mediaID IN %@", mediaIds.map { NSNumber(value: $0) })
+        request.predicate = NSPredicate(
+            format: "blog == %@ AND mediaID IN %@",
+            blog,
+            mediaIds.map { NSNumber(value: $0) }
+        )
 
         do {
             let fetchedMedia = try context.fetch(request) as? [Media] ?? []
diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/PostGBKEditorViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/PostGBKEditorViewController.swift
index 1e4dae14129b..46e498603e0d 100644
--- a/WordPress/Classes/ViewRelated/NewGutenberg/PostGBKEditorViewController.swift
+++ b/WordPress/Classes/ViewRelated/NewGutenberg/PostGBKEditorViewController.swift
@@ -235,7 +235,7 @@ class PostGBKEditorViewController: UIViewController, GutenbergKit.EditorViewCont
                     caption: item.caption,
                     title: item.filename,
                     alt: item.alt,
-                    metadata: [:]
+                    metadata: metadata
                 )
             }
             if let jsonString = convertMediaInfoArrayToJSONString(mediaInfos) {
@@ -314,8 +314,6 @@ class PostGBKEditorViewController: UIViewController, GutenbergKit.EditorViewCont
                 mediaType = mediaType | GutenbergMediaType.other.rawValue
             case .any:
                 mediaType = mediaType | GutenbergMediaType.all.rawValue
-            @unknown default:
-                fatalError()
             }
         }