diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaAddMediaMenuController.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaAddMediaMenuController.swift
index 361f876defe0..dbf98cac1e9d 100644
--- a/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaAddMediaMenuController.swift
+++ b/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaAddMediaMenuController.swift
@@ -37,9 +37,14 @@ final class SiteMediaAddMediaMenuController: NSObject, PHPickerViewControllerDel
         }
         if blog.isHostedAtWPcom, blog.isQuotaAvailable {
             children += [
-                UIAction(title: Strings.viewUsage, subtitle: blog.quotaUsageShortDescription, image: UIImage(systemName: "opticaldiscdrive"), handler: { _ in
+                UIAction(
+                    title: Strings.viewUsage,
+                    subtitle: blog.quotaUsageShortDescription,
+                    image: UIImage(systemName: "opticaldiscdrive")
+                ) { [weak self, weak viewController] _ in
+                    guard let self, let viewController else { return }
                     self.showQuotaView(from: viewController)
-                })
+                }
             ]
         }
         return UIMenu(options: [.displayInline], children: children)