diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 694f96c87901..d786f5daba1e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@
 * [*] Fixed a bug where the "Publish a post" Quick Start tour didn't reflect the app's new information architecture 
 * [***] Free GIFs can now be added to the media library, posts, and pages.
 * [**] You can now set pages as your site's homepage or posts page directly from the Pages list.
+* [*] Block editor: Fix 'Take a Photo' option failing after adding an image to gallery block
 
 15.0
 -----
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
index 3971617bd74f..a07eb98cb2d2 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
@@ -16,7 +16,7 @@ class GutenbergMediaPickerHelper: NSObject {
 
     fileprivate let post: AbstractPost
     fileprivate unowned let context: UIViewController
-    fileprivate unowned var navigationPicker: WPNavigationMediaPickerViewController?
+    fileprivate weak var navigationPicker: WPNavigationMediaPickerViewController?
     fileprivate let noResultsView = NoResultsViewController.controller()
 
     /// Media Library Data Source
@@ -104,6 +104,7 @@ class GutenbergMediaPickerHelper: NSObject {
         cameraPicker.modalPresentationStyle = .currentContext
         cameraPicker.viewControllerToUseToPresent = context
         cameraPicker.options.filter = filter
+        cameraPicker.options.allowMultipleSelection = false
         cameraPicker.showCapture()
     }
 }