diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
index a0cd0b17..414d3dfa 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
@@ -46,14 +46,12 @@ import VDS
             self.accessibilityIdentifier = accessibilityIdentifier
         }
         
-        if let closeButton = viewModel.closeButton {
+        if var closeButton = viewModel.closeButton {
             onCloseClick = { [weak self] _ in
                 guard let self else { return }
                 if closeButton.action.actionType == ActionNoopModel.identifier {
-                    if var dismissAction = self.viewModel.closeButton {
-                        dismissAction.action = ActionDismissNotificationModel()
-                        self.executeAction(model: dismissAction, delegateObject: self.delegateObject, additionalData: self.additionalData)
-                    }
+                    closeButton.action = ActionDismissNotificationModel()
+                    self.executeAction(model: closeButton, delegateObject: self.delegateObject, additionalData: self.additionalData)
                 } else {
                     self.executeAction(model: closeButton, delegateObject: self.delegateObject, additionalData: self.additionalData)
                 }