diff --git a/swift/apple/FirezoneKit/Sources/FirezoneKit/Views/UpdateNotification.swift b/swift/apple/FirezoneKit/Sources/FirezoneKit/Views/UpdateNotification.swift
index 8a01afa13..067d12375 100644
--- a/swift/apple/FirezoneKit/Sources/FirezoneKit/Views/UpdateNotification.swift
+++ b/swift/apple/FirezoneKit/Sources/FirezoneKit/Views/UpdateNotification.swift
@@ -115,8 +115,6 @@ class UpdateChecker {
 }
 
 private class NotificationAdapter: NSObject, UNUserNotificationCenterDelegate {
-  private var lastNotifiedVersion: SemanticVersion?
-  private var lastDismissedVersion: SemanticVersion?
   static let notificationIdentifier = "UPDATE_CATEGORY"
   static let dismissIdentifier = "DISMISS_ACTION"
 
@@ -155,7 +153,7 @@ private class NotificationAdapter: NSObject, UNUserNotificationCenterDelegate {
 
   func showUpdateNotification(version: SemanticVersion) {
     let content = UNMutableNotificationContent()
-    lastNotifiedVersion = version
+    setLastNotifiedVersion(version: version)
     content.title = "Update Firezone"
     content.body = "New version available"
     content.sound = .default
@@ -177,8 +175,12 @@ private class NotificationAdapter: NSObject, UNUserNotificationCenterDelegate {
   func userNotificationCenter(_ center: UNUserNotificationCenter,
                               didReceive response: UNNotificationResponse,
                               withCompletionHandler completionHandler: @escaping () -> Void) {
-    if response.actionIdentifier == NotificationAdapter.dismissIdentifier {
-      setLastDismissedVersion(version: lastNotifiedVersion!)
+    if response.actionIdentifier == NotificationAdapter.dismissIdentifier { // User dismissed this notification
+      if let lastNotifiedVersion = getLastNotifiedVersion() { // Don't notify them again for this version
+        setLastDismissedVersion(version: lastNotifiedVersion)
+      }
+
+      completionHandler()
       return
     }
 
@@ -210,13 +212,22 @@ private class NotificationAdapter: NSObject, UNUserNotificationCenterDelegate {
 }
 
 private let lastDismissedVersionKey = "lastDismissedVersion"
+private let lastNotifiedVersionKey = "lastNotifiedVersion"
 
 private func setLastDismissedVersion(version: SemanticVersion) {
   UserDefaults.standard.setValue(version, forKey: lastDismissedVersionKey)
 }
 
+private func setLastNotifiedVersion(version: SemanticVersion) {
+  UserDefaults.standard.setValue(version, forKey: lastNotifiedVersionKey)
+}
+
 private func getLastDismissedVersion() -> SemanticVersion? {
   return UserDefaults.standard.object(forKey: lastDismissedVersionKey) as? SemanticVersion
 }
 
+private func getLastNotifiedVersion() -> SemanticVersion? {
+  return UserDefaults.standard.object(forKey: lastNotifiedVersionKey) as? SemanticVersion
+}
+
 #endif
diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx
index ebafa40c6..0613bef09 100644
--- a/website/src/components/Changelog/Apple.tsx
+++ b/website/src/components/Changelog/Apple.tsx
@@ -19,7 +19,12 @@ export default function Apple() {
   return (
     <Entries downloadLinks={downloadLinks} title="macOS / iOS">
       {/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
-      <Unreleased></Unreleased>
+      <Unreleased>
+        <ChangeItem pull="8122">
+          Fixes a rare crash that could occur when dismissing the update
+          available notification.
+        </ChangeItem>
+      </Unreleased>
       <Entry version="1.4.2" date={new Date("2025-02-13")}>
         <ChangeItem pull="8104">
           Fixes a minor memory leak that could occur after being unexpectedly